« back to all changes in this revision
Viewing changes to po/fr.po
- browse files at revision 6462
- compare with another revision
- download diff
- download tarball
- view history from revision 6462
- Committer: Patch Queue Manager
- Date: 2012-02-03 10:59:42 UTC
- mfrom: (6461.1.1 trunk)
- Revision ID: pqm@pqm.ubuntu.com-20120203105942-zq9f2k9i5a2akbvu
(vila) Merge 2.5 branch (Vincent Ladeuil)
- files added:
- po/ast.po
- files modified:
- bzrlib/config.py
added
removed
po/fr.po
1
# French translation for bzr
2
# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
3
# This file is distributed under the same license as the bzr package.
4
# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
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-01-16 15:18+0100\n"
11
"PO-Revision-Date: 2012-01-16 16:40+0000\n"
12
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
13
"Language-Team: French <fr@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: 2012-01-17 05:16+0000\n"
19
"X-Generator: Launchpad (build 14676)\n"
20
21
#: bzrlib/add.py:95
22
msgid "skipping {0} (larger than {1} of {2} bytes)"
23
msgstr ""
24
25
#: bzrlib/branch.py:872
26
msgid "Unstacking"
27
msgstr "Dépilement"
28
29
#: bzrlib/branch.py:3183
30
#, python-format
31
msgid "Pushed up to revision %d."
32
msgstr "Publication jusqu'à la révision %d."
33
34
#: bzrlib/branch.py:3185
35
#, python-format
36
msgid "%d tag updated."
37
msgid_plural "%d tags updated."
38
msgstr[0] "%d étiquette mise à jour."
39
msgstr[1] "%d étiquettes mises à jour."
40
41
#: bzrlib/branch.py:3188
42
msgid "No new revisions or tags to push."
43
msgstr "Pas de nouvelles révisions ou étiquettes à publier."
44
45
#: bzrlib/branch.py:3190
46
msgid "No new revisions to push."
47
msgstr "Aucune nouvelle révision à envoyer."
48
49
#: bzrlib/branch.py:3210
50
msgid "checked branch {0} format {1}"
51
msgstr ""
52
53
#: bzrlib/branch.py:3213
54
#, python-format
55
msgid "found error:%s"
56
msgstr "erreur trouvée : %s"
57
58
#: bzrlib/builtins.py:121 bzrlib/builtins.py:2923 bzrlib/workingtree.py:315
59
#, python-format
60
msgid "Ignoring files outside view. View is %s"
61
msgstr ""
62
63
#: bzrlib/builtins.py:130
64
#, python-format
65
msgid "bzr %s --revision takes exactly one revision identifier"
66
msgstr ""
67
68
#: bzrlib/builtins.py:215
69
msgid "Display status summary."
70
msgstr ""
71
72
#: bzrlib/builtins.py:217
73
msgid ""
74
"This reports on versioned and unknown files, reporting them\n"
75
"grouped by state. Possible states are:"
76
msgstr ""
77
"Ceci informe sur les fichiers versionnés et inconnus, regroupés\n"
78
"selon leur état. Les différents états sont :"
79
80
#: bzrlib/builtins.py:220
81
msgid ""
82
"added\n"
83
" Versioned in the working copy but not in the previous revision."
84
msgstr ""
85
"ajouté\n"
86
" Versionné dans la copie de travail mais pas dans la révision précédente."
87
88
#: bzrlib/builtins.py:223
89
msgid ""
90
"removed\n"
91
" Versioned in the previous revision but removed or deleted\n"
92
" in the working copy."
93
msgstr ""
94
"retiré\n"
95
" Versionné dans la révision précédente mais enlevé ou supprimé\n"
96
" de la copie de travail."
97
98
#: bzrlib/builtins.py:227
99
msgid ""
100
"renamed\n"
101
" Path of this file changed from the previous revision;\n"
102
" the text may also have changed. This includes files whose\n"
103
" parent directory was renamed."
104
msgstr ""
105
"renommé\n"
106
" l'emplacement de ce fichier a changé depuis la révision précédente ;\n"
107
" le texte peut également avoir été modifié. Ceci inclut les fichiers "
108
"dont\n"
109
" le répertoire parent a été renommé."
110
111
#: bzrlib/builtins.py:232
112
msgid ""
113
"modified\n"
114
" Text has changed since the previous revision."
115
msgstr ""
116
"modifié\n"
117
" Le texte a été modifié depuis la révision précédente."
118
119
#: bzrlib/builtins.py:235
120
msgid ""
121
"kind changed\n"
122
" File kind has been changed (e.g. from file to directory)."
123
msgstr ""
124
"type modifié\n"
125
" le type du fichier a été modifiée (ex. de fichier à répertoire)."
126
127
#: bzrlib/builtins.py:238
128
msgid ""
129
"unknown\n"
130
" Not versioned and not matching an ignore pattern."
131
msgstr ""
132
"inconnu\n"
133
" Non versionné et ne correspond pas à une règle d'exclusion."
134
135
#: bzrlib/builtins.py:241
136
msgid ""
137
"Additionally for directories, symlinks and files with a changed\n"
138
"executable bit, Bazaar indicates their type using a trailing\n"
139
"character: '/', '@' or '*' respectively. These decorations can be\n"
140
"disabled using the '--no-classify' option."
141
msgstr ""
142
143
#: bzrlib/builtins.py:246
144
msgid ""
145
"To see ignored files use 'bzr ignored'. For details on the\n"
146
"changes to file texts, use 'bzr diff'."
147
msgstr ""
148
"Pour voir la liste des fichiers ignorés, utilisez « bzr ignored ».\n"
149
"Pour le détail des modifications sur les fichiers textes,\n"
150
"utilisez « bzr diff »."
151
152
#: bzrlib/builtins.py:249
153
msgid ""
154
"Note that --short or -S gives status flags for each item, similar\n"
155
"to Subversion's status command. To get output similar to svn -q,\n"
156
"use bzr status -SV."
157
msgstr ""
158
159
#: bzrlib/builtins.py:253
160
msgid ""
161
"If no arguments are specified, the status of the entire working\n"
162
"directory is shown. Otherwise, only the status of the specified\n"
163
"files or directories is reported. If a directory is given, status\n"
164
"is reported for everything inside that directory."
165
msgstr ""
166
167
#: bzrlib/builtins.py:258
168
msgid ""
169
"Before merges are committed, the pending merge tip revisions are\n"
170
"shown. To see all pending merge revisions, use the -v option.\n"
171
"To skip the display of pending merge information altogether, use\n"
172
"the no-pending option or specify a file/directory."
173
msgstr ""
174
175
#: bzrlib/builtins.py:263
176
msgid ""
177
"To compare the working directory to a specific revision, pass a\n"
178
"single revision to the revision argument."
179
msgstr ""
180
181
#: bzrlib/builtins.py:266
182
msgid ""
183
"To see which files have changed in a specific revision, or between\n"
184
"two revisions, pass a revision range to the revision argument.\n"
185
"This will produce the same results as calling 'bzr diff --summarize'."
186
msgstr ""
187
188
#: bzrlib/builtins.py:275
189
msgid "Use short status indicators."
190
msgstr ""
191
192
#: bzrlib/builtins.py:277
193
msgid "Only show versioned files."
194
msgstr ""
195
196
#: bzrlib/builtins.py:279
197
msgid "Don't show pending merges."
198
msgstr ""
199
200
#: bzrlib/builtins.py:282
201
msgid "Do not mark object type using indicator."
202
msgstr ""
203
204
#: bzrlib/builtins.py:297
205
msgid "bzr status --revision takes exactly one or two revision specifiers"
206
msgstr ""
207
"bzr status --revision prend exactement un ou deux numéros de révision"
208
209
#: bzrlib/builtins.py:341 bzrlib/builtins.py:5090
210
msgid "You can only supply one of revision_id or --revision"
211
msgstr ""
212
213
#: bzrlib/builtins.py:344 bzrlib/builtins.py:5092
214
msgid "You must supply either --revision or a revision_id"
215
msgstr ""
216
217
#: bzrlib/builtins.py:351
218
#, python-format
219
msgid "Repository %r does not support access to raw revision texts"
220
msgstr ""
221
222
#: bzrlib/builtins.py:362
223
msgid "The repository {0} contains no revision {1}."
224
msgstr "Le répertoire {0} ne contient aucune révision {1}."
225
226
#: bzrlib/builtins.py:369
227
msgid "You cannot specify a NULL revision."
228
msgstr ""
229
230
#: bzrlib/builtins.py:461
231
msgid "Remove the working tree from a given branch/checkout."
232
msgstr ""
233
234
#: bzrlib/builtins.py:463
235
msgid ""
236
"Since a lightweight checkout is little more than a working tree\n"
237
"this will refuse to run against one."
238
msgstr ""
239
240
#: bzrlib/builtins.py:466
241
msgid "To re-create the working tree, use \"bzr checkout\"."
242
msgstr ""
243
244
#: bzrlib/builtins.py:472
245
msgid ""
246
"Remove the working tree even if it has uncommitted or shelved changes."
247
msgstr ""
248
249
#: bzrlib/builtins.py:486
250
msgid "No working tree to remove"
251
msgstr ""
252
253
#: bzrlib/builtins.py:488
254
msgid "You cannot remove the working tree of a remote path"
255
msgstr ""
256
257
#: bzrlib/builtins.py:497
258
msgid "You cannot remove the working tree from a lightweight checkout"
259
msgstr ""
260
261
#: bzrlib/builtins.py:537
262
msgid ""
263
"The tree does not appear to be corrupt. You probably want \"bzr revert\" "
264
"instead. Use \"--force\" if you are sure you want to reset the working tree."
265
msgstr ""
266
267
#: bzrlib/builtins.py:548
268
msgid ""
269
", the header appears corrupt, try passing -r -1 to set the state to the last "
270
"commit"
271
msgstr ""
272
273
#: bzrlib/builtins.py:552
274
msgid "failed to reset the tree state{0}"
275
msgstr ""
276
277
#: bzrlib/builtins.py:556
278
msgid "Show current revision number."
279
msgstr "Afficher le numéro de la révision actuelle."
280
281
#: bzrlib/builtins.py:558
282
msgid "This is equal to the number of revisions on this branch."
283
msgstr ""
284
285
#: bzrlib/builtins.py:571
286
msgid "--tree and --revision can not be used together"
287
msgstr ""
288
289
#: bzrlib/builtins.py:588 bzrlib/builtins.py:5874
290
msgid "Tags can only be placed on a single revision, not on a range"
291
msgstr ""
292
293
#: bzrlib/builtins.py:612
294
msgid "Show revno of working tree."
295
msgstr ""
296
297
#: bzrlib/builtins.py:660
298
msgid "Add specified files or directories."
299
msgstr ""
300
301
#: bzrlib/builtins.py:662
302
msgid ""
303
"In non-recursive mode, all the named items are added, regardless\n"
304
"of whether they were previously ignored. A warning is given if\n"
305
"any of the named files are already versioned."
306
msgstr ""
307
308
#: bzrlib/builtins.py:666
309
msgid ""
310
"In recursive mode (the default), files are treated the same way\n"
311
"but the behaviour for directories is different. Directories that\n"
312
"are already versioned do not give a warning. All directories,\n"
313
"whether already versioned or not, are searched for files or\n"
314
"subdirectories that are neither versioned or ignored, and these\n"
315
"are added. This search proceeds recursively into versioned\n"
316
"directories. If no names are given '.' is assumed."
317
msgstr ""
318
319
#: bzrlib/builtins.py:674
320
msgid ""
321
"A warning will be printed when nested trees are encountered,\n"
322
"unless they are explicitly ignored."
323
msgstr ""
324
325
#: bzrlib/builtins.py:677
326
msgid ""
327
"Therefore simply saying 'bzr add' will version all files that\n"
328
"are currently unknown."
329
msgstr ""
330
331
#: bzrlib/builtins.py:680
332
msgid ""
333
"Adding a file whose parent directory is not versioned will\n"
334
"implicitly add the parent, and so on up to the root. This means\n"
335
"you should never need to explicitly add a directory, they'll just\n"
336
"get added when you add a file in the directory."
337
msgstr ""
338
339
#: bzrlib/builtins.py:685
340
msgid ""
341
"--dry-run will show which files would be added, but not actually\n"
342
"add them."
343
msgstr ""
344
345
#: bzrlib/builtins.py:688
346
msgid ""
347
"--file-ids-from will try to use the file ids from the supplied path.\n"
348
"It looks up ids trying to find a matching parent directory with the\n"
349
"same filename, and then by pure path. This option is rarely needed\n"
350
"but can be useful when adding the same logical file into two\n"
351
"branches that will be merged later (without showing the two different\n"
352
"adds as a conflict). It is also useful when merging another project\n"
353
"into a subdirectory of this one."
354
msgstr ""
355
356
#: bzrlib/builtins.py:696
357
msgid ""
358
"Any files matching patterns in the ignore list will not be added\n"
359
"unless they are explicitly mentioned."
360
msgstr ""
361
362
#: bzrlib/builtins.py:699
363
msgid ""
364
"In recursive mode, files larger than the configuration option \n"
365
"add.maximum_file_size will be skipped. Named items are never skipped due\n"
366
"to file size."
367
msgstr ""
368
369
#: bzrlib/builtins.py:706
370
msgid "Don't recursively add the contents of directories."
371
msgstr ""
372
373
#: bzrlib/builtins.py:712
374
msgid "Lookup file ids from this tree."
375
msgstr ""
376
377
#: bzrlib/builtins.py:748
378
msgid "ignored {0} matching \"{1}\"\n"
379
msgstr ""
380
381
#: bzrlib/builtins.py:753
382
msgid "Create a new versioned directory."
383
msgstr ""
384
385
#: bzrlib/builtins.py:755
386
msgid "This is equivalent to creating the directory and then adding it."
387
msgstr ""
388
389
#: bzrlib/builtins.py:762
390
msgid "No error if existing, make parent directories as needed."
391
msgstr ""
392
393
#: bzrlib/builtins.py:796
394
#, python-format
395
msgid "added %s\n"
396
msgstr "ajouté %s\n"
397
398
#: bzrlib/builtins.py:838
399
#, python-format
400
msgid "invalid kind %r specified"
401
msgstr ""
402
403
#: bzrlib/builtins.py:875
404
msgid "Move or rename a file."
405
msgstr "Déplacer ou renommer un fichier."
406
407
#: bzrlib/builtins.py:877
408
msgid " bzr mv SOURCE... DESTINATION"
409
msgstr ""
410
411
#: bzrlib/builtins.py:879
412
msgid ""
413
"If the last argument is a versioned directory, all the other names\n"
414
"are moved into it. Otherwise, there must be exactly two arguments\n"
415
"and the file is changed to a new name."
416
msgstr ""
417
418
#: bzrlib/builtins.py:883
419
msgid ""
420
"If OLDNAME does not exist on the filesystem but is versioned and\n"
421
"NEWNAME does exist on the filesystem but is not versioned, mv\n"
422
"assumes that the file has been manually moved and only updates\n"
423
"its internal inventory to reflect that change.\n"
424
"The same is valid when moving many SOURCE files to a DESTINATION."
425
msgstr ""
426
427
#: bzrlib/builtins.py:889
428
msgid "Files cannot be moved between branches."
429
msgstr ""
430
431
#: bzrlib/builtins.py:896
432
msgid ""
433
"Move only the bzr identifier of the file, because the file has already been "
434
"moved."
435
msgstr ""
436
437
#: bzrlib/builtins.py:898
438
msgid "Automatically guess renames."
439
msgstr ""
440
441
#: bzrlib/builtins.py:899
442
msgid "Avoid making changes when guessing renames."
443
msgstr ""
444
445
#: bzrlib/builtins.py:908
446
msgid "--dry-run requires --auto."
447
msgstr ""
448
449
#: bzrlib/builtins.py:912
450
msgid "missing file argument"
451
msgstr ""
452
453
#: bzrlib/builtins.py:916
454
msgid "can not move root of branch"
455
msgstr ""
456
457
#: bzrlib/builtins.py:922
458
msgid "Only one path may be specified to --auto."
459
msgstr ""
460
461
#: bzrlib/builtins.py:925
462
msgid "--after cannot be specified with --auto."
463
msgstr ""
464
465
#: bzrlib/builtins.py:962
466
msgid "to mv multiple files the destination must be a versioned directory"
467
msgstr ""
468
469
#: bzrlib/builtins.py:1014
470
msgid "Turn this branch into a mirror of another branch."
471
msgstr ""
472
473
#: bzrlib/builtins.py:1016
474
msgid ""
475
"By default, this command only works on branches that have not diverged.\n"
476
"Branches are considered diverged if the destination branch's most recent \n"
477
"commit is one that has not been merged (directly or indirectly) into the \n"
478
"parent."
479
msgstr ""
480
481
#: bzrlib/builtins.py:1021
482
msgid ""
483
"If branches have diverged, you can use 'bzr merge' to integrate the changes\n"
484
"from one into the other. Once one branch has merged, the other should\n"
485
"be able to pull it again."
486
msgstr ""
487
488
#: bzrlib/builtins.py:1025
489
msgid ""
490
"If you want to replace your local changes and just want your branch to\n"
491
"match the remote one, use pull --overwrite. This will work even if the two\n"
492
"branches have diverged."
493
msgstr ""
494
495
#: bzrlib/builtins.py:1029
496
msgid ""
497
"If there is no default location set, the first pull will set it (use\n"
498
"--no-remember to avoid setting it). After that, you can omit the\n"
499
"location to use the default. To change the default, use --remember. The\n"
500
"value will only be saved if the remote location can be accessed."
501
msgstr ""
502
503
#: bzrlib/builtins.py:1034
504
msgid ""
505
"The --verbose option will display the revisions pulled using the log_format\n"
506
"configuration option. You can use a different format by overriding it with\n"
507
"-Olog_format=<other_format>."
508
msgstr ""
509
510
#: bzrlib/builtins.py:1038
511
msgid ""
512
"Note: The location can be specified either in the form of a branch,\n"
513
"or in the form of a path to a file containing a merge directive generated\n"
514
"with bzr send."
515
msgstr ""
516
517
#: bzrlib/builtins.py:1046
518
msgid "Show logs of pulled revisions."
519
msgstr ""
520
521
#: bzrlib/builtins.py:1048
522
msgid ""
523
"Branch to pull into, rather than the one containing the working directory."
524
msgstr ""
525
526
#: bzrlib/builtins.py:1051
527
msgid ""
528
"Perform a local pull in a bound branch. Local pulls are not applied to the "
529
"master branch."
530
msgstr ""
531
532
#: bzrlib/builtins.py:1080
533
msgid "Need working tree for --show-base."
534
msgstr ""
535
536
#: bzrlib/builtins.py:1096
537
msgid "No pull location known or specified."
538
msgstr ""
539
540
#: bzrlib/builtins.py:1102
541
#, python-format
542
msgid "Using saved parent location: %s\n"
543
msgstr ""
544
545
#: bzrlib/builtins.py:1109 bzrlib/builtins.py:4300
546
msgid "Cannot use -r with merge directives or bundles"
547
msgstr ""
548
549
#: bzrlib/builtins.py:1150
550
msgid "Update a mirror of this branch."
551
msgstr ""
552
553
#: bzrlib/builtins.py:1152
554
msgid ""
555
"The target branch will not have its working tree populated because this\n"
556
"is both expensive, and is not supported on remote file systems."
557
msgstr ""
558
559
#: bzrlib/builtins.py:1155
560
msgid ""
561
"Some smart servers or protocols *may* put the working tree in place in\n"
562
"the future."
563
msgstr ""
564
565
#: bzrlib/builtins.py:1158
566
msgid ""
567
"This command only works on branches that have not diverged. Branches are\n"
568
"considered diverged if the destination branch's most recent commit is one\n"
569
"that has not been merged (directly or indirectly) by the source branch."
570
msgstr ""
571
572
#: bzrlib/builtins.py:1162
573
msgid ""
574
"If branches have diverged, you can use 'bzr push --overwrite' to replace\n"
575
"the other branch completely, discarding its unmerged changes."
576
msgstr ""
577
578
#: bzrlib/builtins.py:1165
579
msgid ""
580
"If you want to ensure you have the different changes in the other branch,\n"
581
"do a merge (see bzr help merge) from the other branch, and commit that.\n"
582
"After that you will be able to do a push without '--overwrite'."
583
msgstr ""
584
585
#: bzrlib/builtins.py:1169
586
msgid ""
587
"If there is no default push location set, the first push will set it (use\n"
588
"--no-remember to avoid setting it). After that, you can omit the\n"
589
"location to use the default. To change the default, use --remember. The\n"
590
"value will only be saved if the remote location can be accessed."
591
msgstr ""
592
593
#: bzrlib/builtins.py:1174
594
msgid ""
595
"The --verbose option will display the revisions pushed using the log_format\n"
596
"configuration option. You can use a different format by overriding it with\n"
597
"-Olog_format=<other_format>."
598
msgstr ""
599
600
#: bzrlib/builtins.py:1185 bzrlib/foreign.py:272
601
msgid ""
602
"Branch to push from, rather than the one containing the working directory."
603
msgstr ""
604
605
#: bzrlib/builtins.py:1188
606
msgid ""
607
"By default push will fail if the target directory exists, but does not "
608
"already have a control directory. This flag will allow push to proceed."
609
msgstr ""
610
611
#: bzrlib/builtins.py:1193
612
msgid ""
613
"Create a stacked branch that references the public location of the parent "
614
"branch."
615
msgstr ""
616
617
#: bzrlib/builtins.py:1196
618
msgid ""
619
"Create a stacked branch that refers to another branch for the commit "
620
"history. Only the work not present in the referenced branch is included in "
621
"the branch created."
622
msgstr ""
623
624
#: bzrlib/builtins.py:1201 bzrlib/foreign.py:279
625
msgid ""
626
"Refuse to push if there are uncommitted changes in the working tree, --no-"
627
"strict disables the check."
628
msgstr ""
629
630
#: bzrlib/builtins.py:1204
631
msgid "Don't populate the working tree, even for protocols that support it."
632
msgstr ""
633
634
#: bzrlib/builtins.py:1248
635
msgid "Could not determine branch to refer to."
636
msgstr ""
637
638
#: bzrlib/builtins.py:1257
639
#, python-format
640
msgid ""
641
"No push location known or specified. To push to the parent branch (at %s), "
642
"use 'bzr push :parent'."
643
msgstr ""
644
645
#: bzrlib/builtins.py:1263 bzrlib/foreign.py:306
646
msgid "No push location known or specified."
647
msgstr ""
648
649
#: bzrlib/builtins.py:1267
650
#, python-format
651
msgid "Using saved push location: %s"
652
msgstr ""
653
654
#: bzrlib/builtins.py:1277
655
msgid "Create a new branch that is a copy of an existing branch."
656
msgstr ""
657
658
#: bzrlib/builtins.py:1279
659
msgid ""
660
"If the TO_LOCATION is omitted, the last component of the FROM_LOCATION will\n"
661
"be used. In other words, \"branch ../foo/bar\" will attempt to create "
662
"./bar.\n"
663
"If the FROM_LOCATION has no / or path separator embedded, the TO_LOCATION\n"
664
"is derived from the FROM_LOCATION by stripping a leading scheme or drive\n"
665
"identifier, if any. For example, \"branch lp:foo-bar\" will attempt to\n"
666
"create ./foo-bar."
667
msgstr ""
668
669
#: bzrlib/builtins.py:1286
670
msgid ""
671
"To retrieve the branch as of a particular revision, supply the --revision\n"
672
"parameter, as in \"branch foo/bar -r 5\"."
673
msgstr ""
674
675
#: bzrlib/builtins.py:1289
676
msgid "The synonyms 'clone' and 'get' for this command are deprecated."
677
msgstr ""
678
679
#: bzrlib/builtins.py:1299
680
msgid "Create a branch without a working-tree."
681
msgstr ""
682
683
#: bzrlib/builtins.py:1301
684
msgid "Switch the checkout in the current directory to the new branch."
685
msgstr ""
686
687
#: bzrlib/builtins.py:1304
688
msgid ""
689
"Create a stacked branch referring to the source branch. The new branch will "
690
"depend on the availability of the source branch for all operations."
691
msgstr ""
692
693
#: bzrlib/builtins.py:1308
694
msgid "Do not use a shared repository, even if available."
695
msgstr ""
696
697
#: bzrlib/builtins.py:1310
698
msgid ""
699
"By default branch will fail if the target directory exists, but does not "
700
"already have a control directory. This flag will allow branch to proceed."
701
msgstr ""
702
703
#: bzrlib/builtins.py:1315
704
msgid "Bind new branch to from location."
705
msgstr ""
706
707
#: bzrlib/builtins.py:1362
708
#, python-format
709
msgid "Target directory \"%s\" already exists."
710
msgstr ""
711
712
#: bzrlib/builtins.py:1374
713
#, python-format
714
msgid "Parent of \"%s\" does not exist."
715
msgstr ""
716
717
#: bzrlib/builtins.py:1393
718
msgid "The branch {0} has no revision {1}."
719
msgstr ""
720
721
#: bzrlib/builtins.py:1403 bzrlib/push.py:53
722
#, python-format
723
msgid "Created new stacked branch referring to %s."
724
msgstr ""
725
726
#: bzrlib/builtins.py:1407
727
#, python-format
728
msgid "Branched %d revision."
729
msgid_plural "Branched %d revisions."
730
msgstr[0] ""
731
msgstr[1] ""
732
733
#: bzrlib/builtins.py:1412
734
#, python-format
735
msgid "New branch bound to %s"
736
msgstr ""
737
738
#: bzrlib/builtins.py:1417 bzrlib/builtins.py:6187
739
#, python-format
740
msgid "Switched to branch: %s"
741
msgstr ""
742
743
#: bzrlib/builtins.py:1422
744
msgid "List the branches available at the current location."
745
msgstr ""
746
747
#: bzrlib/builtins.py:1424
748
msgid ""
749
"This command will print the names of all the branches at the current\n"
750
"location."
751
msgstr ""
752
753
#: bzrlib/builtins.py:1431
754
msgid ""
755
"Recursively scan for branches rather than just looking in the specified "
756
"location."
757
msgstr ""
758
759
#: bzrlib/builtins.py:1461
760
msgid "(default)"
761
msgstr ""
762
763
#: bzrlib/builtins.py:1473
764
msgid "Create a new checkout of an existing branch."
765
msgstr ""
766
767
#: bzrlib/builtins.py:1475
768
msgid ""
769
"If BRANCH_LOCATION is omitted, checkout will reconstitute a working tree "
770
"for\n"
771
"the branch found in '.'. This is useful if you have removed the working "
772
"tree\n"
773
"or if it was never created - i.e. if you pushed the branch to its current\n"
774
"location using SFTP."
775
msgstr ""
776
777
#: bzrlib/builtins.py:1480
778
msgid ""
779
"If the TO_LOCATION is omitted, the last component of the BRANCH_LOCATION "
780
"will\n"
781
"be used. In other words, \"checkout ../foo/bar\" will attempt to create "
782
"./bar.\n"
783
"If the BRANCH_LOCATION has no / or path separator embedded, the TO_LOCATION\n"
784
"is derived from the BRANCH_LOCATION by stripping a leading scheme or drive\n"
785
"identifier, if any. For example, \"checkout lp:foo-bar\" will attempt to\n"
786
"create ./foo-bar."
787
msgstr ""
788
789
#: bzrlib/builtins.py:1487
790
msgid ""
791
"To retrieve the branch as of a particular revision, supply the --revision\n"
792
"parameter, as in \"checkout foo/bar -r 5\". Note that this will be "
793
"immediately\n"
794
"out of date [so you cannot commit] but it may be useful (i.e. to examine "
795
"old\n"
796
"code.)"
797
msgstr ""
798
799
#: bzrlib/builtins.py:1497
800
msgid ""
801
"Perform a lightweight checkout. Lightweight checkouts depend on access to "
802
"the branch for every operation. Normal checkouts can perform common "
803
"operations like diff and status without such access, and also support local "
804
"commits."
805
msgstr ""
806
807
#: bzrlib/builtins.py:1504
808
msgid "Get file contents from this tree."
809
msgstr ""
810
811
#: bzrlib/builtins.py:1506
812
msgid "Hard-link working tree files where possible."
813
msgstr ""
814
815
#: bzrlib/builtins.py:1547
816
msgid ""
817
"Show list of renamed files.\n"
818
" "
819
msgstr ""
820
821
#: bzrlib/builtins.py:1577
822
msgid "Update a working tree to a new revision."
823
msgstr ""
824
825
#: bzrlib/builtins.py:1579
826
msgid ""
827
"This will perform a merge of the destination revision (the tip of the\n"
828
"branch, or the specified revision) into the working tree, and then make\n"
829
"that revision the basis revision for the working tree. "
830
msgstr ""
831
832
#: bzrlib/builtins.py:1583
833
msgid ""
834
"You can use this to visit an older revision, or to update a working tree\n"
835
"that is out of date from its branch."
836
msgstr ""
837
838
#: bzrlib/builtins.py:1586
839
msgid ""
840
"If there are any uncommitted changes in the tree, they will be carried\n"
841
"across and remain as uncommitted changes after the update. To discard\n"
842
"these changes, use 'bzr revert'. The uncommitted changes may conflict\n"
843
"with the changes brought in by the change in basis revision."
844
msgstr ""
845
846
#: bzrlib/builtins.py:1591
847
msgid ""
848
"If the tree's branch is bound to a master branch, bzr will also update\n"
849
"the branch from the master."
850
msgstr ""
851
852
#: bzrlib/builtins.py:1594
853
msgid ""
854
"You cannot update just a single file or directory, because each Bazaar\n"
855
"working tree has just a single basis revision. If you want to restore a\n"
856
"file that has been removed locally, use 'bzr revert' instead of 'bzr\n"
857
"update'. If you want to restore a file to its state in a previous\n"
858
"revision, use 'bzr revert' with a '-r' option, or use 'bzr cat' to write\n"
859
"out the old content of that file to a new location."
860
msgstr ""
861
862
#: bzrlib/builtins.py:1601
863
msgid ""
864
"The 'dir' argument, if given, must be the location of the root of a\n"
865
"working tree to update. By default, the working tree that contains the \n"
866
"current working directory is used."
867
msgstr ""
868
869
#: bzrlib/builtins.py:1617
870
msgid "bzr update --revision takes exactly one revision"
871
msgstr ""
872
873
#: bzrlib/builtins.py:1625
874
msgid "bzr update can only update a whole tree, not a file or subdirectory"
875
msgstr ""
876
877
#: bzrlib/builtins.py:1656
878
msgid "Tree is up to date at revision {0} of branch {1}"
879
msgstr ""
880
881
#: bzrlib/builtins.py:1672
882
#, python-format
883
msgid ""
884
"branch has no revision %s\n"
885
"bzr update --revision only works for a revision in the branch history"
886
msgstr ""
887
888
#: bzrlib/builtins.py:1678
889
msgid "Updated to revision {0} of branch {1}"
890
msgstr ""
891
892
#: bzrlib/builtins.py:1682
893
msgid ""
894
"Your local commits will now show as pending merges with 'bzr status', and "
895
"can be committed with 'bzr commit'."
896
msgstr ""
897
898
#: bzrlib/builtins.py:1691
899
msgid "Show information about a working tree, branch or repository."
900
msgstr ""
901
902
#: bzrlib/builtins.py:1693
903
msgid ""
904
"This command will show all known locations and formats associated to the\n"
905
"tree, branch or repository."
906
msgstr ""
907
908
#: bzrlib/builtins.py:1696
909
msgid ""
910
"In verbose mode, statistical information is included with each report.\n"
911
"To see extended statistic information, use a verbosity level of 2 or\n"
912
"higher by specifying the verbose option multiple times, e.g. -vv."
913
msgstr ""
914
915
#: bzrlib/builtins.py:1700
916
msgid "Branches and working trees will also report any missing revisions."
917
msgstr ""
918
919
#: bzrlib/builtins.py:1702 bzrlib/builtins.py:3622 bzrlib/builtins.py:4752
920
#: bzrlib/builtins.py:6389
921
msgid ":Examples:"
922
msgstr ""
923
924
#: bzrlib/builtins.py:1704
925
msgid " Display information on the format and related locations:"
926
msgstr ""
927
928
#: bzrlib/builtins.py:1706
929
msgid " bzr info"
930
msgstr ""
931
932
#: bzrlib/builtins.py:1708
933
msgid ""
934
" Display the above together with extended format information and\n"
935
" basic statistics (like the number of files in the working tree and\n"
936
" number of revisions in the branch and repository):"
937
msgstr ""
938
939
#: bzrlib/builtins.py:1712
940
msgid " bzr info -v"
941
msgstr ""
942
943
#: bzrlib/builtins.py:1714
944
msgid " Display the above together with number of committers to the branch:"
945
msgstr ""
946
947
#: bzrlib/builtins.py:1716
948
msgid " bzr info -vv"
949
msgstr ""
950
951
#: bzrlib/builtins.py:1735
952
msgid "Remove files or directories."
953
msgstr ""
954
955
#: bzrlib/builtins.py:1737
956
msgid ""
957
"This makes Bazaar stop tracking changes to the specified files. Bazaar will\n"
958
"delete them if they can easily be recovered using revert otherwise they\n"
959
"will be backed up (adding an extention of the form .~#~). If no options or\n"
960
"parameters are given Bazaar will scan for files that are being tracked by\n"
961
"Bazaar but missing in your tree and stop tracking them for you."
962
msgstr ""
963
964
#: bzrlib/builtins.py:1745
965
msgid "Only remove files that have never been committed."
966
msgstr ""
967
968
#: bzrlib/builtins.py:1747
969
msgid "The file deletion mode to be used."
970
msgstr ""
971
972
#: bzrlib/builtins.py:1748
973
msgid "Deletion Strategy"
974
msgstr ""
975
976
#: bzrlib/builtins.py:1749
977
msgid "Backup changed files (default)."
978
msgstr ""
979
980
#: bzrlib/builtins.py:1750
981
msgid "Delete from bzr but leave the working copy."
982
msgstr ""
983
984
#: bzrlib/builtins.py:1751
985
msgid "Don't backup changed files."
986
msgstr ""
987
988
#: bzrlib/builtins.py:1752
989
msgid ""
990
"Delete all the specified files, even if they can not be recovered and even "
991
"if they are non-empty directories. (deprecated, use no-backup)"
992
msgstr ""
993
994
#: bzrlib/builtins.py:1761
995
msgid "(The --force option is deprecated, rather use --no-backup in future.)"
996
msgstr ""
997
998
#: bzrlib/builtins.py:1778
999
msgid "No matching files."
1000
msgstr ""
1001
1002
#: bzrlib/builtins.py:1839
1003
msgid "Reconcile bzr metadata in a branch."
1004
msgstr ""
1005
1006
#: bzrlib/builtins.py:1841
1007
msgid ""
1008
"This can correct data mismatches that may have been caused by\n"
1009
"previous ghost operations or bzr upgrades. You should only\n"
1010
"need to run this command if 'bzr check' or a bzr developer\n"
1011
"advises you to run it."
1012
msgstr ""
1013
1014
#: bzrlib/builtins.py:1846
1015
msgid ""
1016
"If a second branch is provided, cross-branch reconciliation is\n"
1017
"also attempted, which will check that data like the tree root\n"
1018
"id which was not present in very early bzr versions is represented\n"
1019
"correctly in both branches."
1020
msgstr ""
1021
1022
#: bzrlib/builtins.py:1851
1023
msgid ""
1024
"At the same time it is run it may recompress data resulting in\n"
1025
"a potential saving in disk space or performance gain."
1026
msgstr ""
1027
1028
#: bzrlib/builtins.py:1854
1029
msgid "The branch *MUST* be on a listable system such as local disk or sftp."
1030
msgstr ""
1031
1032
#: bzrlib/builtins.py:1921 bzrlib/builtins.py:2039 bzrlib/builtins.py:3657
1033
msgid ""
1034
"Format for the bzr 2.0 series.\n"
1035
"Uses group-compress storage.\n"
1036
"Provides rich roots which are a one-way transition.\n"
1037
msgstr ""
1038
1039
#: bzrlib/builtins.py:1921 bzrlib/builtins.py:2039 bzrlib/builtins.py:3657
1040
msgid ""
1041
"Pack-based format used in 1.x series. Introduced in 0.92. Interoperates with "
1042
"bzr repositories before 0.92 but cannot be read by bzr < 0.92. "
1043
msgstr ""
1044
1045
#: bzrlib/builtins.py:1921 bzrlib/builtins.py:2039 bzrlib/builtins.py:3657
1046
msgid "The 2a format with experimental support for colocated branches.\n"
1047
msgstr ""
1048
1049
#: bzrlib/builtins.py:1922
1050
msgid "Make a directory into a versioned branch."
1051
msgstr ""
1052
1053
#: bzrlib/builtins.py:1924
1054
msgid ""
1055
"Use this to create an empty branch, or before importing an\n"
1056
"existing project."
1057
msgstr ""
1058
1059
#: bzrlib/builtins.py:1927
1060
msgid ""
1061
"If there is a repository in a parent directory of the location, then\n"
1062
"the history of the branch will be stored in the repository. Otherwise\n"
1063
"init creates a standalone branch which carries its own history\n"
1064
"in the .bzr directory."
1065
msgstr ""
1066
1067
#: bzrlib/builtins.py:1932
1068
msgid ""
1069
"If there is already a branch at the location but it has no working tree,\n"
1070
"the tree can be populated with 'bzr checkout'."
1071
msgstr ""
1072
1073
#: bzrlib/builtins.py:1935
1074
msgid "Recipe for importing a tree of files::"
1075
msgstr ""
1076
1077
#: bzrlib/builtins.py:1937
1078
msgid ""
1079
" cd ~/project\n"
1080
" bzr init\n"
1081
" bzr add .\n"
1082
" bzr status\n"
1083
" bzr commit -m \"imported project\""
1084
msgstr ""
1085
1086
#: bzrlib/builtins.py:1948
1087
msgid ""
1088
"Create the path leading up to the branch if it does not already exist."
1089
msgstr ""
1090
1091
#: bzrlib/builtins.py:1951
1092
msgid "Specify a format for this branch. See \"help formats\"."
1093
msgstr ""
1094
1095
#: bzrlib/builtins.py:1959
1096
msgid ""
1097
"Never change revnos or the existing log. Append revisions to it only."
1098
msgstr ""
1099
1100
#: bzrlib/builtins.py:1962
1101
msgid "Create a branch without a working tree."
1102
msgstr ""
1103
1104
#: bzrlib/builtins.py:1982 bzrlib/push.py:110
1105
#, python-format
1106
msgid ""
1107
"Parent directory of %s does not exist.\n"
1108
"You may supply --create-prefix to create all leading parent directories."
1109
msgstr ""
1110
1111
#: bzrlib/builtins.py:2016
1112
msgid ""
1113
"This branch format cannot be set to append-revisions-only. Try --default."
1114
msgstr ""
1115
1116
#: bzrlib/builtins.py:2027
1117
msgid "Created a {0} (format: {1})\n"
1118
msgstr ""
1119
1120
#: bzrlib/builtins.py:2036
1121
#, python-format
1122
msgid "Using shared repository: %s\n"
1123
msgstr ""
1124
1125
#: bzrlib/builtins.py:2040
1126
msgid "Create a shared repository for branches to share storage space."
1127
msgstr ""
1128
1129
#: bzrlib/builtins.py:2042
1130
msgid ""
1131
"New branches created under the repository directory will store their\n"
1132
"revisions in the repository, not in the branch directory. For branches\n"
1133
"with shared history, this reduces the amount of storage needed and \n"
1134
"speeds up the creation of new branches."
1135
msgstr ""
1136
1137
#: bzrlib/builtins.py:2047
1138
msgid ""
1139
"If the --no-trees option is given then the branches in the repository\n"
1140
"will not have working trees by default. They will still exist as \n"
1141
"directories on disk, but they will not have separate copies of the \n"
1142
"files at a certain revision. This can be useful for repositories that\n"
1143
"store branches which are interacted with through checkouts or remote\n"
1144
"branches, such as on a server."
1145
msgstr ""
1146
1147
#: bzrlib/builtins.py:2054
1148
msgid ""
1149
":Examples:\n"
1150
" Create a shared repository holding just branches::"
1151
msgstr ""
1152
1153
#: bzrlib/builtins.py:2057
1154
msgid ""
1155
" bzr init-repo --no-trees repo\n"
1156
" bzr init repo/trunk"
1157
msgstr ""
1158
1159
#: bzrlib/builtins.py:2060
1160
msgid " Make a lightweight checkout elsewhere::"
1161
msgstr ""
1162
1163
#: bzrlib/builtins.py:2062
1164
msgid ""
1165
" bzr checkout --lightweight repo/trunk trunk-checkout\n"
1166
" cd trunk-checkout\n"
1167
" (add files here)"
1168
msgstr ""
1169
1170
#: bzrlib/builtins.py:2070
1171
msgid ""
1172
"Specify a format for this repository. See \"bzr help formats\" for details."
1173
msgstr ""
1174
1175
#: bzrlib/builtins.py:2074
1176
msgid "Repository format"
1177
msgstr ""
1178
1179
#: bzrlib/builtins.py:2076
1180
msgid "Branches in the repository will default to not having a working tree."
1181
msgstr ""
1182
1183
#: bzrlib/builtins.py:2102
1184
msgid "Show differences in the working tree, between revisions or branches."
1185
msgstr ""
1186
1187
#: bzrlib/builtins.py:2104
1188
msgid ""
1189
"If no arguments are given, all changes for the current tree are listed.\n"
1190
"If files are given, only the changes in those files are listed.\n"
1191
"Remote and multiple branches can be compared by using the --old and\n"
1192
"--new options. If not provided, the default for both is derived from\n"
1193
"the first argument, if any, or the current tree if no arguments are\n"
1194
"given."
1195
msgstr ""
1196
1197
#: bzrlib/builtins.py:2111
1198
msgid ""
1199
"\"bzr diff -p1\" is equivalent to \"bzr diff --prefix old/:new/\", and\n"
1200
"produces patches suitable for \"patch -p1\"."
1201
msgstr ""
1202
1203
#: bzrlib/builtins.py:2114
1204
msgid ""
1205
"Note that when using the -r argument with a range of revisions, the\n"
1206
"differences are computed between the two specified revisions. That\n"
1207
"is, the command does not show the changes introduced by the first \n"
1208
"revision in the range. This differs from the interpretation of \n"
1209
"revision ranges used by \"bzr log\" which includes the first revision\n"
1210
"in the range."
1211
msgstr ""
1212
1213
#: bzrlib/builtins.py:2121
1214
msgid ""
1215
":Exit values:\n"
1216
" 1 - changed\n"
1217
" 2 - unrepresentable changes\n"
1218
" 3 - error\n"
1219
" 0 - no change"
1220
msgstr ""
1221
1222
#: bzrlib/builtins.py:2127
1223
msgid ""
1224
":Examples:\n"
1225
" Shows the difference in the working tree versus the last commit::"
1226
msgstr ""
1227
1228
#: bzrlib/builtins.py:2130
1229
msgid " bzr diff"
1230
msgstr ""
1231
1232
#: bzrlib/builtins.py:2132
1233
msgid " Difference between the working tree and revision 1::"
1234
msgstr ""
1235
1236
#: bzrlib/builtins.py:2134
1237
msgid " bzr diff -r1"
1238
msgstr ""
1239
1240
#: bzrlib/builtins.py:2136
1241
msgid " Difference between revision 3 and revision 1::"
1242
msgstr ""
1243
1244
#: bzrlib/builtins.py:2138
1245
msgid " bzr diff -r1..3"
1246
msgstr ""
1247
1248
#: bzrlib/builtins.py:2140
1249
msgid " Difference between revision 3 and revision 1 for branch xxx::"
1250
msgstr ""
1251
1252
#: bzrlib/builtins.py:2142
1253
msgid " bzr diff -r1..3 xxx"
1254
msgstr ""
1255
1256
#: bzrlib/builtins.py:2144
1257
msgid " The changes introduced by revision 2 (equivalent to -r1..2)::"
1258
msgstr ""
1259
1260
#: bzrlib/builtins.py:2146
1261
msgid " bzr diff -c2"
1262
msgstr ""
1263
1264
#: bzrlib/builtins.py:2148
1265
msgid ""
1266
" To see the changes introduced by revision X::\n"
1267
" \n"
1268
" bzr diff -cX"
1269
msgstr ""
1270
1271
#: bzrlib/builtins.py:2152
1272
msgid ""
1273
" Note that in the case of a merge, the -c option shows the changes\n"
1274
" compared to the left hand parent. To see the changes against\n"
1275
" another parent, use::"
1276
msgstr ""
1277
1278
#: bzrlib/builtins.py:2156
1279
msgid " bzr diff -r<chosen_parent>..X"
1280
msgstr ""
1281
1282
#: bzrlib/builtins.py:2158
1283
msgid ""
1284
" The changes between the current revision and the previous revision\n"
1285
" (equivalent to -c-1 and -r-2..-1)"
1286
msgstr ""
1287
1288
#: bzrlib/builtins.py:2161
1289
msgid " bzr diff -r-2.."
1290
msgstr ""
1291
1292
#: bzrlib/builtins.py:2163
1293
msgid " Show just the differences for file NEWS::"
1294
msgstr ""
1295
1296
#: bzrlib/builtins.py:2165
1297
msgid " bzr diff NEWS"
1298
msgstr ""
1299
1300
#: bzrlib/builtins.py:2167
1301
msgid " Show the differences in working tree xxx for file NEWS::"
1302
msgstr ""
1303
1304
#: bzrlib/builtins.py:2169
1305
msgid " bzr diff xxx/NEWS"
1306
msgstr ""
1307
1308
#: bzrlib/builtins.py:2171
1309
msgid " Show the differences from branch xxx to this working tree:"
1310
msgstr ""
1311
1312
#: bzrlib/builtins.py:2173
1313
msgid " bzr diff --old xxx"
1314
msgstr ""
1315
1316
#: bzrlib/builtins.py:2175
1317
msgid " Show the differences between two branches for file NEWS::"
1318
msgstr ""
1319
1320
#: bzrlib/builtins.py:2177
1321
msgid " bzr diff --old xxx --new yyy NEWS"
1322
msgstr ""
1323
1324
#: bzrlib/builtins.py:2179
1325
msgid " Same as 'bzr diff' but prefix paths with old/ and new/::"
1326
msgstr ""
1327
1328
#: bzrlib/builtins.py:2181
1329
msgid ""
1330
" bzr diff --prefix old/:new/\n"
1331
" \n"
1332
" Show the differences using a custom diff program with options::\n"
1333
" \n"
1334
" bzr diff --using /usr/bin/diff --diff-options -wu"
1335
msgstr ""
1336
1337
#: bzrlib/builtins.py:2191
1338
msgid "Pass these options to the external diff program."
1339
msgstr ""
1340
1341
#: bzrlib/builtins.py:2194
1342
msgid ""
1343
"Set prefixes added to old and new filenames, as two values separated by a "
1344
"colon. (eg \"old/:new/\")."
1345
msgstr ""
1346
1347
#: bzrlib/builtins.py:2197
1348
msgid "Branch/tree to compare from."
1349
msgstr ""
1350
1351
#: bzrlib/builtins.py:2201
1352
msgid "Branch/tree to compare to."
1353
msgstr ""
1354
1355
#: bzrlib/builtins.py:2207
1356
msgid "Use this command to compare files."
1357
msgstr ""
1358
1359
#: bzrlib/builtins.py:2212
1360
msgid "Diff format to use."
1361
msgstr ""
1362
1363
#: bzrlib/builtins.py:2214
1364
msgid "Diff format"
1365
msgstr ""
1366
1367
#: bzrlib/builtins.py:2236
1368
msgid "--prefix expects two values separated by a colon (eg \"old/:new/\")"
1369
msgstr ""
1370
1371
#: bzrlib/builtins.py:2240
1372
msgid "bzr diff --revision takes exactly one or two revision specifiers"
1373
msgstr ""
1374
1375
#: bzrlib/builtins.py:2245 bzrlib/builtins.py:2643 bzrlib/builtins.py:2656
1376
#: bzrlib/builtins.py:2664 bzrlib/builtins.py:4826
1377
msgid "{0} and {1} are mutually exclusive"
1378
msgstr ""
1379
1380
#: bzrlib/builtins.py:2265
1381
msgid ""
1382
"List files deleted in the working tree.\n"
1383
" "
1384
msgstr ""
1385
1386
#: bzrlib/builtins.py:2343
1387
msgid "Show the tree root directory."
1388
msgstr ""
1389
1390
#: bzrlib/builtins.py:2345
1391
msgid ""
1392
"The root is the nearest enclosing directory with a .bzr control\n"
1393
"directory."
1394
msgstr ""
1395
1396
#: bzrlib/builtins.py:2360
1397
msgid "The limit argument must be an integer."
1398
msgstr ""
1399
1400
#: bzrlib/builtins.py:2368
1401
msgid "The levels argument must be an integer."
1402
msgstr ""
1403
1404
#: bzrlib/builtins.py:2373
1405
msgid "Show historical log for a branch or subset of a branch."
1406
msgstr ""
1407
1408
#: bzrlib/builtins.py:2375
1409
msgid ""
1410
"log is bzr's default tool for exploring the history of a branch.\n"
1411
"The branch to use is taken from the first parameter. If no parameters\n"
1412
"are given, the branch containing the working directory is logged.\n"
1413
"Here are some simple examples::"
1414
msgstr ""
1415
1416
#: bzrlib/builtins.py:2380
1417
msgid ""
1418
" bzr log log the current branch\n"
1419
" bzr log foo.py log a file in its branch\n"
1420
" bzr log http://server/branch log a branch on a server"
1421
msgstr ""
1422
1423
#: bzrlib/builtins.py:2384
1424
msgid ""
1425
"The filtering, ordering and information shown for each revision can\n"
1426
"be controlled as explained below. By default, all revisions are\n"
1427
"shown sorted (topologically) so that newer revisions appear before\n"
1428
"older ones and descendants always appear before ancestors. If displayed,\n"
1429
"merged revisions are shown indented under the revision in which they\n"
1430
"were merged."
1431
msgstr ""
1432
1433
#: bzrlib/builtins.py:2391
1434
msgid ":Output control:"
1435
msgstr ""
1436
1437
#: bzrlib/builtins.py:2393
1438
msgid ""
1439
" The log format controls how information about each revision is\n"
1440
" displayed. The standard log formats are called ``long``, ``short``\n"
1441
" and ``line``. The default is long. See ``bzr help log-formats``\n"
1442
" for more details on log formats."
1443
msgstr ""
1444
1445
#: bzrlib/builtins.py:2398
1446
msgid ""
1447
" The following options can be used to control what information is\n"
1448
" displayed::"
1449
msgstr ""
1450
1451
#: bzrlib/builtins.py:2401
1452
msgid ""
1453
" -l N display a maximum of N revisions\n"
1454
" -n N display N levels of revisions (0 for all, 1 for collapsed)\n"
1455
" -v display a status summary (delta) for each revision\n"
1456
" -p display a diff (patch) for each revision\n"
1457
" --show-ids display revision-ids (and file-ids), not just revnos"
1458
msgstr ""
1459
1460
#: bzrlib/builtins.py:2407
1461
msgid ""
1462
" Note that the default number of levels to display is a function of the\n"
1463
" log format. If the -n option is not used, the standard log formats show\n"
1464
" just the top level (mainline)."
1465
msgstr ""
1466
1467
#: bzrlib/builtins.py:2411
1468
msgid ""
1469
" Status summaries are shown using status flags like A, M, etc. To see\n"
1470
" the changes explained using words like ``added`` and ``modified``\n"
1471
" instead, use the -vv option."
1472
msgstr ""
1473
1474
#: bzrlib/builtins.py:2415
1475
msgid ":Ordering control:"
1476
msgstr ""
1477
1478
#: bzrlib/builtins.py:2417
1479
msgid ""
1480
" To display revisions from oldest to newest, use the --forward option.\n"
1481
" In most cases, using this option will have little impact on the total\n"
1482
" time taken to produce a log, though --forward does not incrementally\n"
1483
" display revisions like --reverse does when it can."
1484
msgstr ""
1485
1486
#: bzrlib/builtins.py:2422
1487
msgid ":Revision filtering:"
1488
msgstr ""
1489
1490
#: bzrlib/builtins.py:2424
1491
msgid ""
1492
" The -r option can be used to specify what revision or range of revisions\n"
1493
" to filter against. The various forms are shown below::"
1494
msgstr ""
1495
1496
#: bzrlib/builtins.py:2427
1497
msgid ""
1498
" -rX display revision X\n"
1499
" -rX.. display revision X and later\n"
1500
" -r..Y display up to and including revision Y\n"
1501
" -rX..Y display from X to Y inclusive"
1502
msgstr ""
1503
1504
#: bzrlib/builtins.py:2432
1505
msgid ""
1506
" See ``bzr help revisionspec`` for details on how to specify X and Y.\n"
1507
" Some common examples are given below::"
1508
msgstr ""
1509
1510
#: bzrlib/builtins.py:2435
1511
msgid ""
1512
" -r-1 show just the tip\n"
1513
" -r-10.. show the last 10 mainline revisions\n"
1514
" -rsubmit:.. show what's new on this branch\n"
1515
" -rancestor:path.. show changes since the common ancestor of this\n"
1516
" branch and the one at location path\n"
1517
" -rdate:yesterday.. show changes since yesterday"
1518
msgstr ""
1519
1520
#: bzrlib/builtins.py:2442
1521
msgid ""
1522
" When logging a range of revisions using -rX..Y, log starts at\n"
1523
" revision Y and searches back in history through the primary\n"
1524
" (\"left-hand\") parents until it finds X. When logging just the\n"
1525
" top level (using -n1), an error is reported if X is not found\n"
1526
" along the way. If multi-level logging is used (-n0), X may be\n"
1527
" a nested merge revision and the log will be truncated accordingly."
1528
msgstr ""
1529
1530
#: bzrlib/builtins.py:2449
1531
msgid ":Path filtering:"
1532
msgstr ""
1533
1534
#: bzrlib/builtins.py:2451
1535
msgid ""
1536
" If parameters are given and the first one is not a branch, the log\n"
1537
" will be filtered to show only those revisions that changed the\n"
1538
" nominated files or directories."
1539
msgstr ""
1540
1541
#: bzrlib/builtins.py:2455
1542
msgid ""
1543
" Filenames are interpreted within their historical context. To log a\n"
1544
" deleted file, specify a revision range so that the file existed at\n"
1545
" the end or start of the range."
1546
msgstr ""
1547
1548
#: bzrlib/builtins.py:2459
1549
msgid ""
1550
" Historical context is also important when interpreting pathnames of\n"
1551
" renamed files/directories. Consider the following example:"
1552
msgstr ""
1553
1554
#: bzrlib/builtins.py:2462
1555
msgid ""
1556
" * revision 1: add tutorial.txt\n"
1557
" * revision 2: modify tutorial.txt\n"
1558
" * revision 3: rename tutorial.txt to guide.txt; add tutorial.txt"
1559
msgstr ""
1560
1561
#: bzrlib/builtins.py:2466
1562
msgid " In this case:"
1563
msgstr ""
1564
1565
#: bzrlib/builtins.py:2468
1566
msgid " * ``bzr log guide.txt`` will log the file added in revision 1"
1567
msgstr ""
1568
1569
#: bzrlib/builtins.py:2470
1570
msgid ""
1571
" * ``bzr log tutorial.txt`` will log the new file added in revision 3"
1572
msgstr ""
1573
1574
#: bzrlib/builtins.py:2472
1575
msgid ""
1576
" * ``bzr log -r2 -p tutorial.txt`` will show the changes made to\n"
1577
" the original file in revision 2."
1578
msgstr ""
1579
1580
#: bzrlib/builtins.py:2475
1581
msgid ""
1582
" * ``bzr log -r2 -p guide.txt`` will display an error message as there\n"
1583
" was no file called guide.txt in revision 2."
1584
msgstr ""
1585
1586
#: bzrlib/builtins.py:2478
1587
msgid ""
1588
" Renames are always followed by log. By design, there is no need to\n"
1589
" explicitly ask for this (and no way to stop logging a file back\n"
1590
" until it was last renamed)."
1591
msgstr ""
1592
1593
#: bzrlib/builtins.py:2482
1594
msgid ":Other filtering:"
1595
msgstr ""
1596
1597
#: bzrlib/builtins.py:2484
1598
msgid ""
1599
" The --match option can be used for finding revisions that match a\n"
1600
" regular expression in a commit message, committer, author or bug.\n"
1601
" Specifying the option several times will match any of the supplied\n"
1602
" expressions. --match-author, --match-bugs, --match-committer and\n"
1603
" --match-message can be used to only match a specific field."
1604
msgstr ""
1605
1606
#: bzrlib/builtins.py:2490
1607
msgid ":Tips & tricks:"
1608
msgstr ""
1609
1610
#: bzrlib/builtins.py:2492
1611
msgid ""
1612
" GUI tools and IDEs are often better at exploring history than command\n"
1613
" line tools: you may prefer qlog or viz from qbzr or bzr-gtk, the\n"
1614
" bzr-explorer shell, or the Loggerhead web interface. See the Plugin\n"
1615
" Guide <http://doc.bazaar.canonical.com/plugins/en/> and\n"
1616
" <http://wiki.bazaar.canonical.com/IDEIntegration>. "
1617
msgstr ""
1618
1619
#: bzrlib/builtins.py:2498
1620
msgid ""
1621
" You may find it useful to add the aliases below to ``bazaar.conf``::"
1622
msgstr ""
1623
1624
#: bzrlib/builtins.py:2500
1625
msgid ""
1626
" [ALIASES]\n"
1627
" tip = log -r-1\n"
1628
" top = log -l10 --line\n"
1629
" show = log -v -p"
1630
msgstr ""
1631
1632
#: bzrlib/builtins.py:2505
1633
msgid ""
1634
" ``bzr tip`` will then show the latest revision while ``bzr top``\n"
1635
" will show the last 10 mainline revisions. To see the details of a\n"
1636
" particular revision X, ``bzr show -rX``."
1637
msgstr ""
1638
1639
#: bzrlib/builtins.py:2509
1640
msgid ""
1641
" If you are interested in looking deeper into a particular merge X,\n"
1642
" use ``bzr log -n0 -rX``."
1643
msgstr ""
1644
1645
#: bzrlib/builtins.py:2512
1646
msgid ""
1647
" ``bzr log -v`` on a branch with lots of history is currently\n"
1648
" very slow. A fix for this issue is currently under development.\n"
1649
" With or without that fix, it is recommended that a revision range\n"
1650
" be given when using the -v option."
1651
msgstr ""
1652
1653
#: bzrlib/builtins.py:2517
1654
msgid ""
1655
" bzr has a generic full-text matching plugin, bzr-search, that can be\n"
1656
" used to find revisions matching user names, commit messages, etc.\n"
1657
" Among other features, this plugin can find all revisions containing\n"
1658
" a list of words but not others."
1659
msgstr ""
1660
1661
#: bzrlib/builtins.py:2522
1662
msgid ""
1663
" When exploring non-mainline history on large projects with deep\n"
1664
" history, the performance of log can be greatly improved by installing\n"
1665
" the historycache plugin. This plugin buffers historical information\n"
1666
" trading disk space for faster speed."
1667
msgstr ""
1668
1669
#: bzrlib/builtins.py:2531
1670
msgid "Show from oldest to newest."
1671
msgstr ""
1672
1673
#: bzrlib/builtins.py:2534
1674
msgid "Show files changed in each revision."
1675
msgstr ""
1676
1677
#: bzrlib/builtins.py:2540
1678
msgid "Show just the specified revision. See also \"help revisionspec\"."
1679
msgstr ""
1680
1681
#: bzrlib/builtins.py:2544
1682
msgid "What names to list as authors - first, all or committer."
1683
msgstr ""
1684
1685
#: bzrlib/builtins.py:2545
1686
msgid "Authors"
1687
msgstr ""
1688
1689
#: bzrlib/builtins.py:2550
1690
msgid "Number of levels to display - 0 for all, 1 for flat."
1691
msgstr ""
1692
1693
#: bzrlib/builtins.py:2560
1694
msgid "Limit the output to the first N revisions."
1695
msgstr ""
1696
1697
#: bzrlib/builtins.py:2565
1698
msgid "Show changes made in each revision as a patch."
1699
msgstr ""
1700
1701
#: bzrlib/builtins.py:2567
1702
msgid "Show merged revisions like --levels 0 does."
1703
msgstr ""
1704
1705
#: bzrlib/builtins.py:2571
1706
msgid "Do not report commits with more than one parent."
1707
msgstr ""
1708
1709
#: bzrlib/builtins.py:2573
1710
msgid ""
1711
"Display only the revisions that are not part of both ancestries (require -"
1712
"rX..Y)."
1713
msgstr ""
1714
1715
#: bzrlib/builtins.py:2577
1716
msgid "Show digital signature validity."
1717
msgstr ""
1718
1719
#: bzrlib/builtins.py:2580
1720
msgid "Show revisions whose properties match this expression."
1721
msgstr ""
1722
1723
#: bzrlib/builtins.py:2584
1724
msgid "Show revisions whose message matches this expression."
1725
msgstr ""
1726
1727
#: bzrlib/builtins.py:2588
1728
msgid "Show revisions whose committer matches this expression."
1729
msgstr ""
1730
1731
#: bzrlib/builtins.py:2592
1732
msgid "Show revisions whose authors match this expression."
1733
msgstr ""
1734
1735
#: bzrlib/builtins.py:2596
1736
msgid "Show revisions whose bugs match this expression."
1737
msgstr ""
1738
1739
#: bzrlib/builtins.py:2650
1740
msgid "--exclude-common-ancestry requires -r with two revisions"
1741
msgstr ""
1742
1743
#: bzrlib/builtins.py:2678
1744
#, python-format
1745
msgid "Path unknown at end or start of revision range: %s"
1746
msgstr ""
1747
1748
#: bzrlib/builtins.py:2795
1749
#, python-format
1750
msgid "bzr %s doesn't accept two revisions in different branches."
1751
msgstr ""
1752
1753
#: bzrlib/builtins.py:2811
1754
#, python-format
1755
msgid "bzr %s --revision takes one or two values."
1756
msgstr ""
1757
1758
#: bzrlib/builtins.py:2856
1759
msgid ""
1760
"List files in a tree.\n"
1761
" "
1762
msgstr ""
1763
1764
#: bzrlib/builtins.py:2865
1765
msgid "Recurse into subdirectories."
1766
msgstr ""
1767
1768
#: bzrlib/builtins.py:2867
1769
msgid "Print paths relative to the root of the branch."
1770
msgstr ""
1771
1772
#: bzrlib/builtins.py:2869
1773
msgid "Print unknown files."
1774
msgstr ""
1775
1776
#: bzrlib/builtins.py:2870
1777
msgid "Print versioned files."
1778
msgstr ""
1779
1780
#: bzrlib/builtins.py:2873
1781
msgid "Print ignored files."
1782
msgstr ""
1783
1784
#: bzrlib/builtins.py:2875
1785
msgid "List entries of a particular kind: file, directory, symlink."
1786
msgstr ""
1787
1788
#: bzrlib/builtins.py:2888
1789
msgid "invalid kind specified"
1790
msgstr ""
1791
1792
#: bzrlib/builtins.py:2891
1793
msgid "Cannot set both --verbose and --null"
1794
msgstr ""
1795
1796
#: bzrlib/builtins.py:2900
1797
msgid "cannot specify both --from-root and PATH"
1798
msgstr ""
1799
1800
#: bzrlib/builtins.py:2987
1801
msgid "Ignore specified files or patterns."
1802
msgstr ""
1803
1804
#: bzrlib/builtins.py:2989
1805
msgid "See ``bzr help patterns`` for details on the syntax of patterns."
1806
msgstr ""
1807
1808
#: bzrlib/builtins.py:2991
1809
msgid ""
1810
"If a .bzrignore file does not exist, the ignore command\n"
1811
"will create one and add the specified files or patterns to the newly\n"
1812
"created file. The ignore command will also automatically add the \n"
1813
".bzrignore file to be versioned. Creating a .bzrignore file without\n"
1814
"the use of the ignore command will require an explicit add command."
1815
msgstr ""
1816
1817
#: bzrlib/builtins.py:2997
1818
msgid ""
1819
"To remove patterns from the ignore list, edit the .bzrignore file.\n"
1820
"After adding, editing or deleting that file either indirectly by\n"
1821
"using this command or directly by using an editor, be sure to commit\n"
1822
"it."
1823
msgstr ""
1824
1825
#: bzrlib/builtins.py:3002
1826
msgid ""
1827
"Bazaar also supports a global ignore file ~/.bazaar/ignore. On Windows\n"
1828
"the global ignore file can be found in the application data directory as\n"
1829
"C:\\Documents and Settings\\<user>\\Application Data\\Bazaar\\2.0\\ignore.\n"
1830
"Global ignores are not touched by this command. The global ignore file\n"
1831
"can be edited directly using an editor."
1832
msgstr ""
1833
1834
#: bzrlib/builtins.py:3008
1835
msgid ""
1836
"Patterns prefixed with '!' are exceptions to ignore patterns and take\n"
1837
"precedence over regular ignores. Such exceptions are used to specify\n"
1838
"files that should be versioned which would otherwise be ignored."
1839
msgstr ""
1840
1841
#: bzrlib/builtins.py:3012
1842
msgid ""
1843
"Patterns prefixed with '!!' act as regular ignore patterns, but have\n"
1844
"precedence over the '!' exception patterns."
1845
msgstr ""
1846
1847
#: bzrlib/builtins.py:3015
1848
msgid ""
1849
":Notes: \n"
1850
" \n"
1851
"* Ignore patterns containing shell wildcards must be quoted from\n"
1852
" the shell on Unix."
1853
msgstr ""
1854
1855
#: bzrlib/builtins.py:3020
1856
msgid ""
1857
"* Ignore patterns starting with \"#\" act as comments in the ignore file.\n"
1858
" To ignore patterns that begin with that character, use the \"RE:\" prefix."
1859
msgstr ""
1860
1861
#: bzrlib/builtins.py:3023
1862
msgid ""
1863
":Examples:\n"
1864
" Ignore the top level Makefile::"
1865
msgstr ""
1866
1867
#: bzrlib/builtins.py:3026
1868
msgid " bzr ignore ./Makefile"
1869
msgstr ""
1870
1871
#: bzrlib/builtins.py:3028
1872
msgid " Ignore .class files in all directories...::"
1873
msgstr ""
1874
1875
#: bzrlib/builtins.py:3030
1876
msgid " bzr ignore \"*.class\""
1877
msgstr ""
1878
1879
#: bzrlib/builtins.py:3032
1880
msgid " ...but do not ignore \"special.class\"::"
1881
msgstr ""
1882
1883
#: bzrlib/builtins.py:3034
1884
msgid " bzr ignore \"!special.class\""
1885
msgstr ""
1886
1887
#: bzrlib/builtins.py:3036
1888
msgid " Ignore files whose name begins with the \"#\" character::"
1889
msgstr ""
1890
1891
#: bzrlib/builtins.py:3038
1892
msgid " bzr ignore \"RE:^#\""
1893
msgstr ""
1894
1895
#: bzrlib/builtins.py:3040 bzrlib/builtins.py:3044
1896
msgid " Ignore .o files under the lib directory::"
1897
msgstr ""
1898
1899
#: bzrlib/builtins.py:3042
1900
msgid " bzr ignore \"lib/**/*.o\""
1901
msgstr ""
1902
1903
#: bzrlib/builtins.py:3046
1904
msgid " bzr ignore \"RE:lib/.*\\.o\""
1905
msgstr ""
1906
1907
#: bzrlib/builtins.py:3048
1908
msgid " Ignore everything but the \"debian\" toplevel directory::"
1909
msgstr ""
1910
1911
#: bzrlib/builtins.py:3050
1912
msgid ""
1913
" bzr ignore \"RE:(?!debian/).*\"\n"
1914
" \n"
1915
" Ignore everything except the \"local\" toplevel directory,\n"
1916
" but always ignore autosave files ending in ~, even under local/::\n"
1917
" \n"
1918
" bzr ignore \"*\"\n"
1919
" bzr ignore \"!./local\"\n"
1920
" bzr ignore \"!!*~\""
1921
msgstr ""
1922
1923
#: bzrlib/builtins.py:3064
1924
msgid "Display the default ignore rules that bzr uses."
1925
msgstr ""
1926
1927
#: bzrlib/builtins.py:3076
1928
msgid "ignore requires at least one NAME_PATTERN or --default-rules."
1929
msgstr ""
1930
1931
#: bzrlib/builtins.py:3087
1932
#, python-format
1933
msgid "Invalid ignore pattern found. %s"
1934
msgid_plural "Invalid ignore patterns found. %s"
1935
msgstr[0] ""
1936
msgstr[1] ""
1937
1938
#: bzrlib/builtins.py:3096
1939
msgid "NAME_PATTERN should not be an absolute path"
1940
msgstr ""
1941
1942
#: bzrlib/builtins.py:3109
1943
#, python-format
1944
msgid ""
1945
"Warning: the following files are version controlled and match your ignore "
1946
"pattern:\n"
1947
"%s\n"
1948
"These files will continue to be version controlled unless you 'bzr remove' "
1949
"them.\n"
1950
msgstr ""
1951
1952
#: bzrlib/builtins.py:3116
1953
msgid "List ignored files and the patterns that matched them."
1954
msgstr ""
1955
1956
#: bzrlib/builtins.py:3118
1957
msgid ""
1958
"List all the ignored files and the ignore pattern that caused the file to\n"
1959
"be ignored."
1960
msgstr ""
1961
1962
#: bzrlib/builtins.py:3121
1963
msgid "Alternatively, to list just the files::"
1964
msgstr ""
1965
1966
#: bzrlib/builtins.py:3123
1967
msgid " bzr ls --ignored"
1968
msgstr ""
1969
1970
#: bzrlib/builtins.py:3157
1971
#, python-format
1972
msgid "not a valid revision-number: %r"
1973
msgstr ""
1974
1975
#: bzrlib/builtins.py:3164
1976
msgid ""
1977
"Export current or past revision to a destination directory or archive."
1978
msgstr ""
1979
1980
#: bzrlib/builtins.py:3166
1981
msgid "If no revision is specified this exports the last committed revision."
1982
msgstr ""
1983
1984
#: bzrlib/builtins.py:3168
1985
msgid ""
1986
"Format may be an \"exporter\" name, such as tar, tgz, tbz2. If none is\n"
1987
"given, try to find the format with the extension. If no extension\n"
1988
"is found exports to a directory (equivalent to --format=dir)."
1989
msgstr ""
1990
1991
#: bzrlib/builtins.py:3172
1992
msgid ""
1993
"If root is supplied, it will be used as the root directory inside\n"
1994
"container formats (tar, zip, etc). If it is not supplied it will default\n"
1995
"to the exported filename. The root option has no effect for 'dir' format."
1996
msgstr ""
1997
1998
#: bzrlib/builtins.py:3176
1999
msgid ""
2000
"If branch is omitted then the branch containing the current working\n"
2001
"directory will be used."
2002
msgstr ""
2003
2004
#: bzrlib/builtins.py:3179
2005
msgid ""
2006
"Note: Export of tree with non-ASCII filenames to zip is not supported."
2007
msgstr ""
2008
2009
#: bzrlib/builtins.py:3181
2010
msgid ""
2011
" ================= =========================\n"
2012
" Supported formats Autodetected by extension\n"
2013
" ================= =========================\n"
2014
" dir (none)\n"
2015
" tar .tar\n"
2016
" tbz2 .tar.bz2, .tbz2\n"
2017
" tgz .tar.gz, .tgz\n"
2018
" zip .zip\n"
2019
" ================= ========================="
2020
msgstr ""
2021
2022
#: bzrlib/builtins.py:3195
2023
msgid "Type of file to export to."
2024
msgstr ""
2025
2026
#: bzrlib/builtins.py:3198
2027
msgid "Apply content filters to export the convenient form."
2028
msgstr ""
2029
2030
#: bzrlib/builtins.py:3202
2031
msgid "Name of the root directory inside the exported file."
2032
msgstr ""
2033
2034
#: bzrlib/builtins.py:3204
2035
msgid ""
2036
"Set modification time of files to that of the last revision in which it was "
2037
"changed."
2038
msgstr ""
2039
2040
#: bzrlib/builtins.py:3207
2041
msgid ""
2042
"Export the working tree contents rather than that of the last revision."
2043
msgstr ""
2044
2045
#: bzrlib/builtins.py:3226
2046
msgid "--uncommitted requires a working tree"
2047
msgstr ""
2048
2049
#: bzrlib/builtins.py:3235
2050
#, python-format
2051
msgid "Unsupported export format: %s"
2052
msgstr ""
2053
2054
#: bzrlib/builtins.py:3239
2055
msgid ""
2056
"Write the contents of a file as of a given revision to standard output."
2057
msgstr ""
2058
2059
#: bzrlib/builtins.py:3241
2060
msgid "If no revision is nominated, the last revision is used."
2061
msgstr ""
2062
2063
#: bzrlib/builtins.py:3243
2064
msgid ""
2065
"Note: Take care to redirect standard output when using this command on a\n"
2066
"binary file."
2067
msgstr ""
2068
2069
#: bzrlib/builtins.py:3249
2070
msgid "The path name in the old tree."
2071
msgstr ""
2072
2073
#: bzrlib/builtins.py:3250
2074
msgid "Apply content filters to display the convenience form."
2075
msgstr ""
2076
2077
#: bzrlib/builtins.py:3261
2078
msgid "bzr cat --revision takes exactly one revision specifier"
2079
msgstr ""
2080
2081
#: bzrlib/builtins.py:3286 bzrlib/builtins.py:3298
2082
msgid "{0!r} is not present in revision {1}"
2083
msgstr ""
2084
2085
#: bzrlib/builtins.py:3321
2086
msgid "Commit changes into a new revision."
2087
msgstr ""
2088
2089
#: bzrlib/builtins.py:3323
2090
msgid ""
2091
"An explanatory message needs to be given for each commit. This is\n"
2092
"often done by using the --message option (getting the message from the\n"
2093
"command line) or by using the --file option (getting the message from\n"
2094
"a file). If neither of these options is given, an editor is opened for\n"
2095
"the user to enter the message. To see the changed files in the\n"
2096
"boilerplate text loaded into the editor, use the --show-diff option."
2097
msgstr ""
2098
2099
#: bzrlib/builtins.py:3330
2100
msgid ""
2101
"By default, the entire tree is committed and the person doing the\n"
2102
"commit is assumed to be the author. These defaults can be overridden\n"
2103
"as explained below."
2104
msgstr ""
2105
2106
#: bzrlib/builtins.py:3334
2107
msgid ":Selective commits:"
2108
msgstr ""
2109
2110
#: bzrlib/builtins.py:3336
2111
msgid ""
2112
" If selected files are specified, only changes to those files are\n"
2113
" committed. If a directory is specified then the directory and\n"
2114
" everything within it is committed."
2115
msgstr ""
2116
2117
#: bzrlib/builtins.py:3340
2118
msgid ""
2119
" When excludes are given, they take precedence over selected files.\n"
2120
" For example, to commit only changes within foo, but not changes\n"
2121
" within foo/bar::"
2122
msgstr ""
2123
2124
#: bzrlib/builtins.py:3344
2125
msgid " bzr commit foo -x foo/bar"
2126
msgstr ""
2127
2128
#: bzrlib/builtins.py:3346
2129
msgid " A selective commit after a merge is not yet supported."
2130
msgstr ""
2131
2132
#: bzrlib/builtins.py:3348
2133
msgid ":Custom authors:"
2134
msgstr ""
2135
2136
#: bzrlib/builtins.py:3350
2137
msgid ""
2138
" If the author of the change is not the same person as the committer,\n"
2139
" you can specify the author's name using the --author option. The\n"
2140
" name should be in the same format as a committer-id, e.g.\n"
2141
" \"John Doe <jdoe@example.com>\". If there is more than one author of\n"
2142
" the change you can specify the option multiple times, once for each\n"
2143
" author."
2144
msgstr ""
2145
2146
#: bzrlib/builtins.py:3357
2147
msgid ":Checks:"
2148
msgstr ""
2149
2150
#: bzrlib/builtins.py:3359
2151
msgid ""
2152
" A common mistake is to forget to add a new file or directory before\n"
2153
" running the commit command. The --strict option checks for unknown\n"
2154
" files and aborts the commit if any are found. More advanced pre-commit\n"
2155
" checks can be implemented by defining hooks. See ``bzr help hooks``\n"
2156
" for details."
2157
msgstr ""
2158
2159
#: bzrlib/builtins.py:3365
2160
msgid ":Things to note:"
2161
msgstr ""
2162
2163
#: bzrlib/builtins.py:3367
2164
msgid ""
2165
" If you accidentially commit the wrong changes or make a spelling\n"
2166
" mistake in the commit message say, you can use the uncommit command\n"
2167
" to undo it. See ``bzr help uncommit`` for details."
2168
msgstr ""
2169
2170
#: bzrlib/builtins.py:3371
2171
msgid ""
2172
" Hooks can also be configured to run after a commit. This allows you\n"
2173
" to trigger updates to external systems like bug trackers. The --fixes\n"
2174
" option can be used to record the association between a revision and\n"
2175
" one or more bugs. See ``bzr help bugs`` for details."
2176
msgstr ""
2177
2178
#: bzrlib/builtins.py:3381
2179
msgid "Do not consider changes made to a given path."
2180
msgstr ""
2181
2182
#: bzrlib/builtins.py:3384
2183
msgid "Description of the new revision."
2184
msgstr ""
2185
2186
#: bzrlib/builtins.py:3387
2187
msgid "Commit even if nothing has changed."
2188
msgstr ""
2189
2190
#: bzrlib/builtins.py:3391
2191
msgid "Take commit message from this file."
2192
msgstr ""
2193
2194
#: bzrlib/builtins.py:3393
2195
msgid "Refuse to commit if there are unknown files in the working tree."
2196
msgstr ""
2197
2198
#: bzrlib/builtins.py:3396
2199
msgid ""
2200
"Manually set a commit time using commit date format, e.g. '2009-10-10 "
2201
"08:00:00 +0100'."
2202
msgstr ""
2203
2204
#: bzrlib/builtins.py:3399
2205
msgid "Mark a bug as being fixed by this revision (see \"bzr help bugs\")."
2206
msgstr ""
2207
2208
#: bzrlib/builtins.py:3402
2209
msgid "Set the author's name, if it's different from the committer."
2210
msgstr ""
2211
2212
#: bzrlib/builtins.py:3405
2213
msgid ""
2214
"Perform a local commit in a bound branch. Local commits are not pushed to "
2215
"the master branch until a normal commit is performed."
2216
msgstr ""
2217
2218
#: bzrlib/builtins.py:3411
2219
msgid ""
2220
"When no message is supplied, show the diff along with the status summary in "
2221
"the message editor."
2222
msgstr ""
2223
2224
#: bzrlib/builtins.py:3414
2225
msgid ""
2226
"When committing to a foreign version control system do not push data that "
2227
"can not be natively represented."
2228
msgstr ""
2229
2230
#: bzrlib/builtins.py:3432
2231
#, python-format
2232
msgid ""
2233
"No tracker specified for bug %s. Use the form 'tracker:id' or specify a "
2234
"default bug tracker using the `bugtracker` option.\n"
2235
"See \"bzr help bugs\" for more information on this feature. Commit refused."
2236
msgstr ""
2237
2238
#: bzrlib/builtins.py:3441
2239
#, python-format
2240
msgid ""
2241
"Invalid bug %s. Must be in the form of 'tracker:id'. See \"bzr help bugs\" "
2242
"for more information on this feature.\n"
2243
"Commit refused."
2244
msgstr ""
2245
2246
#: bzrlib/builtins.py:3450
2247
#, python-format
2248
msgid "Unrecognized bug %s. Commit refused."
2249
msgstr ""
2250
2251
#: bzrlib/builtins.py:3453
2252
#, python-format
2253
msgid ""
2254
"%s\n"
2255
"Commit refused."
2256
msgstr ""
2257
2258
#: bzrlib/builtins.py:3477
2259
msgid "Could not parse --commit-time: "
2260
msgstr ""
2261
2262
#: bzrlib/builtins.py:3517
2263
msgid "please specify either --message or --file"
2264
msgstr ""
2265
2266
#: bzrlib/builtins.py:3546
2267
msgid "please specify a commit message with either --message or --file"
2268
msgstr ""
2269
2270
#: bzrlib/builtins.py:3549
2271
msgid ""
2272
"Empty commit message specified. Please specify a commit message with either -"
2273
"-message or --file or leave a blank message with --message \"\"."
2274
msgstr ""
2275
2276
#: bzrlib/builtins.py:3569
2277
msgid ""
2278
"No changes to commit. Please 'bzr add' the files you want to commit, or use -"
2279
"-unchanged to force an empty commit."
2280
msgstr ""
2281
2282
#: bzrlib/builtins.py:3573
2283
msgid ""
2284
"Conflicts detected in working tree. Use \"bzr conflicts\" to list, \"bzr "
2285
"resolve FILE\" to resolve."
2286
msgstr ""
2287
2288
#: bzrlib/builtins.py:3577
2289
msgid "Commit refused because there are unknown files in the working tree."
2290
msgstr ""
2291
2292
#: bzrlib/builtins.py:3580
2293
msgid ""
2294
"\n"
2295
"To commit to master branch, run update and then commit.\n"
2296
"You can also pass --local to commit to continue working disconnected."
2297
msgstr ""
2298
2299
#: bzrlib/builtins.py:3588
2300
msgid ""
2301
"Validate working tree structure, branch consistency and repository history."
2302
msgstr ""
2303
2304
#: bzrlib/builtins.py:3590
2305
msgid ""
2306
"This command checks various invariants about branch and repository storage\n"
2307
"to detect data corruption or bzr bugs."
2308
msgstr ""
2309
2310
#: bzrlib/builtins.py:3593
2311
msgid ""
2312
"The working tree and branch checks will only give output if a problem is\n"
2313
"detected. The output fields of the repository check are:"
2314
msgstr ""
2315
2316
#: bzrlib/builtins.py:3596
2317
msgid ""
2318
"revisions\n"
2319
" This is just the number of revisions checked. It doesn't\n"
2320
" indicate a problem."
2321
msgstr ""
2322
2323
#: bzrlib/builtins.py:3600
2324
msgid ""
2325
"versionedfiles\n"
2326
" This is just the number of versionedfiles checked. It\n"
2327
" doesn't indicate a problem."
2328
msgstr ""
2329
2330
#: bzrlib/builtins.py:3604
2331
msgid ""
2332
"unreferenced ancestors\n"
2333
" Texts that are ancestors of other texts, but\n"
2334
" are not properly referenced by the revision ancestry. This is a\n"
2335
" subtle problem that Bazaar can work around."
2336
msgstr ""
2337
2338
#: bzrlib/builtins.py:3609
2339
msgid ""
2340
"unique file texts\n"
2341
" This is the total number of unique file contents\n"
2342
" seen in the checked revisions. It does not indicate a problem."
2343
msgstr ""
2344
2345
#: bzrlib/builtins.py:3613
2346
msgid ""
2347
"repeated file texts\n"
2348
" This is the total number of repeated texts seen\n"
2349
" in the checked revisions. Texts can be repeated when their file\n"
2350
" entries are modified, but the file contents are not. It does not\n"
2351
" indicate a problem."
2352
msgstr ""
2353
2354
#: bzrlib/builtins.py:3619
2355
msgid ""
2356
"If no restrictions are specified, all Bazaar data that is found at the "
2357
"given\n"
2358
"location will be checked."
2359
msgstr ""
2360
2361
#: bzrlib/builtins.py:3624
2362
msgid " Check the tree and branch at 'foo'::"
2363
msgstr ""
2364
2365
#: bzrlib/builtins.py:3626
2366
msgid " bzr check --tree --branch foo"
2367
msgstr ""
2368
2369
#: bzrlib/builtins.py:3628
2370
msgid " Check only the repository at 'bar'::"
2371
msgstr ""
2372
2373
#: bzrlib/builtins.py:3630
2374
msgid " bzr check --repo bar"
2375
msgstr ""
2376
2377
#: bzrlib/builtins.py:3632
2378
msgid " Check everything at 'baz'::"
2379
msgstr ""
2380
2381
#: bzrlib/builtins.py:3634
2382
msgid " bzr check baz"
2383
msgstr ""
2384
2385
#: bzrlib/builtins.py:3640
2386
msgid "Check the branch related to the current directory."
2387
msgstr ""
2388
2389
#: bzrlib/builtins.py:3642
2390
msgid "Check the repository related to the current directory."
2391
msgstr ""
2392
2393
#: bzrlib/builtins.py:3644
2394
msgid "Check the working tree related to the current directory."
2395
msgstr ""
2396
2397
#: bzrlib/builtins.py:3658
2398
msgid "Upgrade a repository, branch or working tree to a newer format."
2399
msgstr ""
2400
2401
#: bzrlib/builtins.py:3660
2402
msgid ""
2403
"When the default format has changed after a major new release of\n"
2404
"Bazaar, you may be informed during certain operations that you\n"
2405
"should upgrade. Upgrading to a newer format may improve performance\n"
2406
"or make new features available. It may however limit interoperability\n"
2407
"with older repositories or with older versions of Bazaar."
2408
msgstr ""
2409
2410
#: bzrlib/builtins.py:3666
2411
msgid ""
2412
"If you wish to upgrade to a particular format rather than the\n"
2413
"current default, that can be specified using the --format option.\n"
2414
"As a consequence, you can use the upgrade command this way to\n"
2415
"\"downgrade\" to an earlier format, though some conversions are\n"
2416
"a one way process (e.g. changing from the 1.x default to the\n"
2417
"2.x default) so downgrading is not always possible."
2418
msgstr ""
2419
2420
#: bzrlib/builtins.py:3673
2421
msgid ""
2422
"A backup.bzr.~#~ directory is created at the start of the conversion\n"
2423
"process (where # is a number). By default, this is left there on\n"
2424
"completion. If the conversion fails, delete the new .bzr directory\n"
2425
"and rename this one back in its place. Use the --clean option to ask\n"
2426
"for the backup.bzr directory to be removed on successful conversion.\n"
2427
"Alternatively, you can delete it by hand if everything looks good\n"
2428
"afterwards."
2429
msgstr ""
2430
2431
#: bzrlib/builtins.py:3681
2432
msgid ""
2433
"If the location given is a shared repository, dependent branches\n"
2434
"are also converted provided the repository converts successfully.\n"
2435
"If the conversion of a branch fails, remaining branches are still\n"
2436
"tried."
2437
msgstr ""
2438
2439
#: bzrlib/builtins.py:3686
2440
msgid ""
2441
"For more information on upgrades, see the Bazaar Upgrade Guide,\n"
2442
"http://doc.bazaar.canonical.com/latest/en/upgrade-guide/."
2443
msgstr ""
2444
2445
#: bzrlib/builtins.py:3694
2446
msgid "Upgrade to a specific format. See \"bzr help formats\" for details."
2447
msgstr ""
2448
2449
#: bzrlib/builtins.py:3698
2450
msgid "Branch format"
2451
msgstr ""
2452
2453
#: bzrlib/builtins.py:3700
2454
msgid "Remove the backup.bzr directory if successful."
2455
msgstr ""
2456
2457
#: bzrlib/builtins.py:3702
2458
msgid "Show what would be done, but don't actually do anything."
2459
msgstr ""
2460
2461
#: bzrlib/builtins.py:3717
2462
msgid "Show or set bzr user id."
2463
msgstr ""
2464
2465
#: bzrlib/builtins.py:3719
2466
msgid ""
2467
":Examples:\n"
2468
" Show the email of the current user::"
2469
msgstr ""
2470
2471
#: bzrlib/builtins.py:3722
2472
msgid " bzr whoami --email"
2473
msgstr ""
2474
2475
#: bzrlib/builtins.py:3724
2476
msgid " Set the current user::"
2477
msgstr ""
2478
2479
#: bzrlib/builtins.py:3726
2480
msgid " bzr whoami \"Frank Chu <fchu@example.com>\""
2481
msgstr ""
2482
2483
#: bzrlib/builtins.py:3730
2484
msgid "Display email address only."
2485
msgstr ""
2486
2487
#: bzrlib/builtins.py:3732
2488
msgid "Set identity for the current branch instead of globally."
2489
msgstr ""
2490
2491
#: bzrlib/builtins.py:3758
2492
msgid "--email can only be used to display existing identity"
2493
msgstr ""
2494
2495
#: bzrlib/builtins.py:3780
2496
msgid "Print or set the branch nickname."
2497
msgstr ""
2498
2499
#: bzrlib/builtins.py:3782
2500
msgid ""
2501
"If unset, the tree root directory name is used as the nickname.\n"
2502
"To print the current nickname, execute with no argument."
2503
msgstr ""
2504
2505
#: bzrlib/builtins.py:3785
2506
msgid ""
2507
"Bound branches use the nickname of its master branch unless it is set\n"
2508
"locally."
2509
msgstr ""
2510
2511
#: bzrlib/builtins.py:3805
2512
msgid "Set/unset and display aliases."
2513
msgstr ""
2514
2515
#: bzrlib/builtins.py:3807
2516
msgid ""
2517
":Examples:\n"
2518
" Show the current aliases::"
2519
msgstr ""
2520
2521
#: bzrlib/builtins.py:3810
2522
msgid " bzr alias"
2523
msgstr ""
2524
2525
#: bzrlib/builtins.py:3812
2526
msgid " Show the alias specified for 'll'::"
2527
msgstr ""
2528
2529
#: bzrlib/builtins.py:3814
2530
msgid " bzr alias ll"
2531
msgstr ""
2532
2533
#: bzrlib/builtins.py:3816
2534
msgid " Set an alias for 'll'::"
2535
msgstr ""
2536
2537
#: bzrlib/builtins.py:3818
2538
msgid " bzr alias ll=\"log --line -r-10..-1\""
2539
msgstr ""
2540
2541
#: bzrlib/builtins.py:3820
2542
msgid " To remove an alias for 'll'::"
2543
msgstr ""
2544
2545
#: bzrlib/builtins.py:3822
2546
msgid " bzr alias --remove ll"
2547
msgstr ""
2548
2549
#: bzrlib/builtins.py:3827
2550
msgid "Remove the alias."
2551
msgstr ""
2552
2553
#: bzrlib/builtins.py:3845
2554
msgid "bzr alias --remove expects an alias to remove."
2555
msgstr ""
2556
2557
#: bzrlib/builtins.py:4026
2558
msgid ""
2559
"subunit not available. subunit needs to be installed to use --subunit."
2560
msgstr ""
2561
2562
#: bzrlib/builtins.py:4043
2563
msgid ""
2564
"--benchmark is no longer supported from bzr 2.2; use bzr-usertest instead"
2565
msgstr ""
2566
2567
#: bzrlib/builtins.py:4090
2568
msgid "Show version of bzr."
2569
msgstr ""
2570
2571
#: bzrlib/builtins.py:4094
2572
msgid "Print just the version number."
2573
msgstr ""
2574
2575
#: bzrlib/builtins.py:4113
2576
msgid "It sure does!\n"
2577
msgstr ""
2578
2579
#: bzrlib/builtins.py:4137
2580
#, python-format
2581
msgid "merge base is revision %s\n"
2582
msgstr ""
2583
2584
#: bzrlib/builtins.py:4141
2585
msgid "Perform a three-way merge."
2586
msgstr ""
2587
2588
#: bzrlib/builtins.py:4143
2589
msgid ""
2590
"The source of the merge can be specified either in the form of a branch,\n"
2591
"or in the form of a path to a file containing a merge directive generated\n"
2592
"with bzr send. If neither is specified, the default is the upstream branch\n"
2593
"or the branch most recently merged using --remember. The source of the\n"
2594
"merge may also be specified in the form of a path to a file in another\n"
2595
"branch: in this case, only the modifications to that file are merged into\n"
2596
"the current working tree."
2597
msgstr ""
2598
2599
#: bzrlib/builtins.py:4151
2600
msgid ""
2601
"When merging from a branch, by default bzr will try to merge in all new\n"
2602
"work from the other branch, automatically determining an appropriate base\n"
2603
"revision. If this fails, you may need to give an explicit base."
2604
msgstr ""
2605
2606
#: bzrlib/builtins.py:4155
2607
msgid ""
2608
"To pick a different ending revision, pass \"--revision OTHER\". bzr will\n"
2609
"try to merge in all new work up to and including revision OTHER."
2610
msgstr ""
2611
2612
#: bzrlib/builtins.py:4158
2613
msgid ""
2614
"If you specify two values, \"--revision BASE..OTHER\", only revisions BASE\n"
2615
"through OTHER, excluding BASE but including OTHER, will be merged. If this\n"
2616
"causes some revisions to be skipped, i.e. if the destination branch does\n"
2617
"not already contain revision BASE, such a merge is commonly referred to as\n"
2618
"a \"cherrypick\". Unlike a normal merge, Bazaar does not currently track\n"
2619
"cherrypicks. The changes look like a normal commit, and the history of the\n"
2620
"changes from the other branch is not stored in the commit."
2621
msgstr ""
2622
2623
#: bzrlib/builtins.py:4166
2624
msgid "Revision numbers are always relative to the source branch."
2625
msgstr ""
2626
2627
#: bzrlib/builtins.py:4168 bzrlib/conflicts.py:52 bzrlib/conflicts.py:106
2628
msgid ""
2629
"Merge will do its best to combine the changes in two branches, but there\n"
2630
"are some kinds of problems only a human can fix. When it encounters those,\n"
2631
"it will mark a conflict. A conflict means that you need to fix something,\n"
2632
"before you should commit."
2633
msgstr ""
2634
2635
#: bzrlib/builtins.py:4173
2636
msgid ""
2637
"Use bzr resolve when you have fixed a problem. See also bzr conflicts."
2638
msgstr ""
2639
2640
#: bzrlib/builtins.py:4175
2641
msgid ""
2642
"If there is no default branch set, the first merge will set it (use\n"
2643
"--no-remember to avoid setting it). After that, you can omit the branch\n"
2644
"to use the default. To change the default, use --remember. The value will\n"
2645
"only be saved if the remote location can be accessed."
2646
msgstr ""
2647
2648
#: bzrlib/builtins.py:4180
2649
msgid ""
2650
"The results of the merge are placed into the destination working\n"
2651
"directory, where they can be reviewed (with bzr diff), tested, and then\n"
2652
"committed to record the result of the merge."
2653
msgstr ""
2654
2655
#: bzrlib/builtins.py:4184
2656
msgid ""
2657
"merge refuses to run if there are any uncommitted changes, unless\n"
2658
"--force is given. If --force is given, then the changes from the source \n"
2659
"will be merged with the current working tree, including any uncommitted\n"
2660
"changes in the tree. The --force option can also be used to create a\n"
2661
"merge revision which has more than two parents."
2662
msgstr ""
2663
2664
#: bzrlib/builtins.py:4190
2665
msgid ""
2666
"If one would like to merge changes from the working tree of the other\n"
2667
"branch without merging any committed revisions, the --uncommitted option\n"
2668
"can be given."
2669
msgstr ""
2670
2671
#: bzrlib/builtins.py:4194
2672
msgid ""
2673
"To select only some changes to merge, use \"merge -i\", which will prompt\n"
2674
"you to apply each diff hunk and file change, similar to \"shelve\"."
2675
msgstr ""
2676
2677
#: bzrlib/builtins.py:4197
2678
msgid ""
2679
":Examples:\n"
2680
" To merge all new revisions from bzr.dev::"
2681
msgstr ""
2682
2683
#: bzrlib/builtins.py:4200
2684
msgid " bzr merge ../bzr.dev"
2685
msgstr ""
2686
2687
#: bzrlib/builtins.py:4202
2688
msgid " To merge changes up to and including revision 82 from bzr.dev::"
2689
msgstr ""
2690
2691
#: bzrlib/builtins.py:4204
2692
msgid " bzr merge -r 82 ../bzr.dev"
2693
msgstr ""
2694
2695
#: bzrlib/builtins.py:4206
2696
msgid " To merge the changes introduced by 82, without previous changes::"
2697
msgstr ""
2698
2699
#: bzrlib/builtins.py:4208
2700
msgid " bzr merge -r 81..82 ../bzr.dev"
2701
msgstr ""
2702
2703
#: bzrlib/builtins.py:4210
2704
msgid " To apply a merge directive contained in /tmp/merge::"
2705
msgstr ""
2706
2707
#: bzrlib/builtins.py:4212
2708
msgid " bzr merge /tmp/merge"
2709
msgstr ""
2710
2711
#: bzrlib/builtins.py:4214
2712
msgid ""
2713
" To create a merge revision with three parents from two branches\n"
2714
" feature1a and feature1b:"
2715
msgstr ""
2716
2717
#: bzrlib/builtins.py:4217
2718
msgid ""
2719
" bzr merge ../feature1a\n"
2720
" bzr merge ../feature1b --force\n"
2721
" bzr commit -m 'revision with three parents'"
2722
msgstr ""
2723
2724
#: bzrlib/builtins.py:4229
2725
msgid "Merge even if the destination tree has uncommitted changes."
2726
msgstr ""
2727
2728
#: bzrlib/builtins.py:4235
2729
msgid ""
2730
"Apply uncommitted changes from a working copy, instead of branch changes."
2731
msgstr ""
2732
2733
#: bzrlib/builtins.py:4237
2734
msgid ""
2735
"If the destination is already completely merged into the source, pull from "
2736
"the source rather than merging. When this happens, you do not need to "
2737
"commit the result."
2738
msgstr ""
2739
2740
#: bzrlib/builtins.py:4242
2741
msgid ""
2742
"Branch to merge into, rather than the one containing the working directory."
2743
msgstr ""
2744
2745
#: bzrlib/builtins.py:4244
2746
msgid "Instead of merging, show a diff of the merge."
2747
msgstr ""
2748
2749
#: bzrlib/builtins.py:4246
2750
msgid "Select changes interactively."
2751
msgstr ""
2752
2753
#: bzrlib/builtins.py:4268
2754
msgid ""
2755
"Merging into empty branches not currently supported, "
2756
"https://bugs.launchpad.net/bzr/+bug/308562"
2757
msgstr ""
2758
2759
#: bzrlib/builtins.py:4295
2760
msgid "Cannot use --uncommitted with bundles or merge directives."
2761
msgstr ""
2762
2763
#: bzrlib/builtins.py:4306
2764
msgid "Cannot use --uncommitted and --revision at the same time."
2765
msgstr ""
2766
2767
#: bzrlib/builtins.py:4326
2768
msgid "merger: "
2769
msgstr ""
2770
2771
#: bzrlib/builtins.py:4328 bzrlib/bundle/apply_bundle.py:71
2772
msgid "Nothing to do."
2773
msgstr ""
2774
2775
#: bzrlib/builtins.py:4332
2776
msgid "Cannot pull individual files"
2777
msgstr ""
2778
2779
#: bzrlib/builtins.py:4340
2780
msgid "This branch has no commits. (perhaps you would prefer 'bzr pull')"
2781
msgstr ""
2782
2783
#: bzrlib/builtins.py:4398
2784
#, python-format
2785
msgid "Show-base is not supported for this merge type. %s"
2786
msgstr ""
2787
2788
#: bzrlib/builtins.py:4407
2789
#, python-format
2790
msgid "Conflict reduction is not supported for merge type %s."
2791
msgstr ""
2792
2793
#: bzrlib/builtins.py:4411
2794
msgid "Cannot do conflict reduction and show base."
2795
msgstr ""
2796
2797
#: bzrlib/builtins.py:4522
2798
msgid "No location specified or remembered"
2799
msgstr ""
2800
2801
#: bzrlib/builtins.py:4524
2802
msgid "{0} remembered {1} location {2}"
2803
msgstr ""
2804
2805
#: bzrlib/builtins.py:4530
2806
msgid "Redo a merge."
2807
msgstr ""
2808
2809
#: bzrlib/builtins.py:4532
2810
msgid ""
2811
"Use this if you want to try a different merge technique while resolving\n"
2812
"conflicts. Some merge techniques are better than others, and remerge\n"
2813
"lets you try different ones on different files."
2814
msgstr ""
2815
2816
#: bzrlib/builtins.py:4536
2817
msgid ""
2818
"The options for remerge have the same meaning and defaults as the ones for\n"
2819
"merge. The difference is that remerge can (only) be run when there is a\n"
2820
"pending merge, and it lets you specify particular files."
2821
msgstr ""
2822
2823
#: bzrlib/builtins.py:4540
2824
msgid ""
2825
":Examples:\n"
2826
" Re-do the merge of all conflicted files, and show the base text in\n"
2827
" conflict regions, in addition to the usual THIS and OTHER texts::"
2828
msgstr ""
2829
2830
#: bzrlib/builtins.py:4544
2831
msgid " bzr remerge --show-base"
2832
msgstr ""
2833
2834
#: bzrlib/builtins.py:4546
2835
msgid ""
2836
" Re-do the merge of \"foobar\", using the weave merge algorithm, with\n"
2837
" additional processing to reduce the size of conflict regions::"
2838
msgstr ""
2839
2840
#: bzrlib/builtins.py:4549
2841
msgid " bzr remerge --merge-type weave --reprocess foobar"
2842
msgstr ""
2843
2844
#: bzrlib/builtins.py:4556
2845
msgid "Show base revision text in conflicts."
2846
msgstr ""
2847
2848
#: bzrlib/builtins.py:4568
2849
msgid ""
2850
"Sorry, remerge only works after normal merges. Not cherrypicking or multi-"
2851
"merges."
2852
msgstr ""
2853
2854
#: bzrlib/builtins.py:4624
2855
msgid "Revert files to a previous revision."
2856
msgstr ""
2857
2858
#: bzrlib/builtins.py:4626
2859
msgid ""
2860
"Giving a list of files will revert only those files. Otherwise, all files\n"
2861
"will be reverted. If the revision is not specified with '--revision', the\n"
2862
"last committed revision is used."
2863
msgstr ""
2864
2865
#: bzrlib/builtins.py:4630
2866
msgid ""
2867
"To remove only some changes, without reverting to a prior version, use\n"
2868
"merge instead. For example, \"merge . -r -2..-3\" (don't forget the \".\")\n"
2869
"will remove the changes introduced by the second last commit (-2), without\n"
2870
"affecting the changes introduced by the last commit (-1). To remove\n"
2871
"certain changes on a hunk-by-hunk basis, see the shelve command."
2872
msgstr ""
2873
2874
#: bzrlib/builtins.py:4636
2875
msgid ""
2876
"By default, any files that have been manually changed will be backed up\n"
2877
"first. (Files changed only by merge are not backed up.) Backup files have\n"
2878
"'.~#~' appended to their name, where # is a number."
2879
msgstr ""
2880
2881
#: bzrlib/builtins.py:4640
2882
msgid ""
2883
"When you provide files, you can use their current pathname or the pathname\n"
2884
"from the target revision. So you can use revert to \"undelete\" a file by\n"
2885
"name. If you name a directory, all the contents of that directory will be\n"
2886
"reverted."
2887
msgstr ""
2888
2889
#: bzrlib/builtins.py:4645
2890
msgid ""
2891
"If you have newly added files since the target revision, they will be\n"
2892
"removed. If the files to be removed have been changed, backups will be\n"
2893
"created as above. Directories containing unknown files will not be\n"
2894
"deleted."
2895
msgstr ""
2896
2897
#: bzrlib/builtins.py:4650
2898
msgid ""
2899
"The working tree contains a list of revisions that have been merged but\n"
2900
"not yet committed. These revisions will be included as additional parents\n"
2901
"of the next commit. Normally, using revert clears that list as well as\n"
2902
"reverting the files. If any files are specified, revert leaves the list\n"
2903
"of uncommitted merges alone and reverts only the files. Use ``bzr revert\n"
2904
".`` in the tree root to revert all files but keep the recorded merges,\n"
2905
"and ``bzr revert --forget-merges`` to clear the pending merge list without\n"
2906
"reverting any files."
2907
msgstr ""
2908
2909
#: bzrlib/builtins.py:4659
2910
msgid ""
2911
"Using \"bzr revert --forget-merges\", it is possible to apply all of the\n"
2912
"changes from a branch in a single revision. To do this, perform the merge\n"
2913
"as desired. Then doing revert with the \"--forget-merges\" option will "
2914
"keep\n"
2915
"the content of the tree as it was, but it will clear the list of pending\n"
2916
"merges. The next commit will then contain all of the changes that are\n"
2917
"present in the other branch, but without any other parent revisions.\n"
2918
"Because this technique forgets where these changes originated, it may\n"
2919
"cause additional conflicts on later merges involving the same source and\n"
2920
"target branches."
2921
msgstr ""
2922
2923
#: bzrlib/builtins.py:4673
2924
msgid "Do not save backups of reverted files."
2925
msgstr ""
2926
2927
#: bzrlib/builtins.py:4675
2928
msgid "Remove pending merge marker, without changing any files."
2929
msgstr ""
2930
2931
#: bzrlib/builtins.py:4706
2932
msgid ""
2933
"Show help on a command or other topic.\n"
2934
" "
2935
msgstr ""
2936
2937
#: bzrlib/builtins.py:4711
2938
msgid "Show help on all commands."
2939
msgstr ""
2940
2941
#: bzrlib/builtins.py:4740
2942
msgid "Show unmerged/unpulled revisions between two branches."
2943
msgstr ""
2944
2945
#: bzrlib/builtins.py:4742
2946
msgid "OTHER_BRANCH may be local or remote."
2947
msgstr ""
2948
2949
#: bzrlib/builtins.py:4744
2950
msgid ""
2951
"To filter on a range of revisions, you can use the command -r begin..end\n"
2952
"-r revision requests a specific revision, -r ..end or -r begin.. are\n"
2953
"also valid.\n"
2954
" \n"
2955
":Exit values:\n"
2956
" 1 - some missing revisions\n"
2957
" 0 - no missing revisions"
2958
msgstr ""
2959
2960
#: bzrlib/builtins.py:4754
2961
msgid ""
2962
" Determine the missing revisions between this and the branch at the\n"
2963
" remembered pull location::"
2964
msgstr ""
2965
2966
#: bzrlib/builtins.py:4757
2967
msgid " bzr missing"
2968
msgstr ""
2969
2970
#: bzrlib/builtins.py:4759
2971
msgid " Determine the missing revisions between this and another branch::"
2972
msgstr ""
2973
2974
#: bzrlib/builtins.py:4761
2975
msgid " bzr missing http://server/branch"
2976
msgstr ""
2977
2978
#: bzrlib/builtins.py:4763
2979
msgid ""
2980
" Determine the missing revisions up to a specific revision on the other\n"
2981
" branch::"
2982
msgstr ""
2983
2984
#: bzrlib/builtins.py:4766
2985
msgid " bzr missing -r ..-10"
2986
msgstr ""
2987
2988
#: bzrlib/builtins.py:4768
2989
msgid ""
2990
" Determine the missing revisions up to a specific revision on this\n"
2991
" branch::"
2992
msgstr ""
2993
2994
#: bzrlib/builtins.py:4771
2995
msgid " bzr missing --my-revision ..-10"
2996
msgstr ""
2997
2998
#: bzrlib/builtins.py:4778
2999
msgid "Reverse the order of revisions."
3000
msgstr ""
3001
3002
#: bzrlib/builtins.py:4780
3003
msgid "Display changes in the local branch only."
3004
msgstr ""
3005
3006
#: bzrlib/builtins.py:4781
3007
msgid "Same as --mine-only."
3008
msgstr ""
3009
3010
#: bzrlib/builtins.py:4783
3011
msgid "Display changes in the remote branch only."
3012
msgstr ""
3013
3014
#: bzrlib/builtins.py:4784
3015
msgid "Same as --theirs-only."
3016
msgstr ""
3017
3018
#: bzrlib/builtins.py:4789
3019
msgid ""
3020
"Filter on other branch revisions (inclusive). See \"help revisionspec\" for "
3021
"details."
3022
msgstr ""
3023
3024
#: bzrlib/builtins.py:4793
3025
msgid ""
3026
"Filter on local branch revisions (inclusive). See \"help revisionspec\" for "
3027
"details."
3028
msgstr ""
3029
3030
#: bzrlib/builtins.py:4796
3031
msgid "Show all revisions in addition to the mainline ones."
3032
msgstr ""
3033
3034
#: bzrlib/builtins.py:4850
3035
msgid "No peer location known or specified."
3036
msgstr ""
3037
3038
#: bzrlib/builtins.py:4854
3039
msgid "Using saved parent location: {0}\n"
3040
msgstr ""
3041
3042
#: bzrlib/builtins.py:4887
3043
#, python-format
3044
msgid "You have %d extra revision:\n"
3045
msgid_plural "You have %d extra revisions:\n"
3046
msgstr[0] ""
3047
msgstr[1] ""
3048
3049
#: bzrlib/builtins.py:4903
3050
#, python-format
3051
msgid "You are missing %d revision:\n"
3052
msgid_plural "You are missing %d revisions:\n"
3053
msgstr[0] ""
3054
msgstr[1] ""
3055
3056
#: bzrlib/builtins.py:4915
3057
msgid "This branch has no new revisions.\n"
3058
msgstr ""
3059
3060
#: bzrlib/builtins.py:4918
3061
msgid "Other branch has no new revisions.\n"
3062
msgstr ""
3063
3064
#: bzrlib/builtins.py:4923
3065
msgid "Branches are up to date.\n"
3066
msgstr ""
3067
3068
#: bzrlib/builtins.py:4934
3069
msgid "Compress the data within a repository."
3070
msgstr ""
3071
3072
#: bzrlib/builtins.py:4936
3073
msgid ""
3074
"This operation compresses the data within a bazaar repository. As\n"
3075
"bazaar supports automatic packing of repository, this operation is\n"
3076
"normally not required to be done manually."
3077
msgstr ""
3078
3079
#: bzrlib/builtins.py:4940
3080
msgid ""
3081
"During the pack operation, bazaar takes a backup of existing repository\n"
3082
"data, i.e. pack files. This backup is eventually removed by bazaar\n"
3083
"automatically when it is safe to do so. To save disk space by removing\n"
3084
"the backed up pack files, the --clean-obsolete-packs option may be\n"
3085
"used."
3086
msgstr ""
3087
3088
#: bzrlib/builtins.py:4946
3089
msgid ""
3090
"Warning: If you use --clean-obsolete-packs and your machine crashes\n"
3091
"during or immediately after repacking, you may be left with a state\n"
3092
"where the deletion has been written to disk but the new packs have not\n"
3093
"been. In this case the repository may be unusable."
3094
msgstr ""
3095
3096
#: bzrlib/builtins.py:4955
3097
msgid "Delete obsolete packs to save disk space."
3098
msgstr ""
3099
3100
#: bzrlib/builtins.py:4969
3101
msgid "List the installed plugins."
3102
msgstr ""
3103
3104
#: bzrlib/builtins.py:4971
3105
msgid ""
3106
"This command displays the list of installed plugins including\n"
3107
"version of plugin and a short description of each."
3108
msgstr ""
3109
3110
#: bzrlib/builtins.py:4974
3111
msgid "--verbose shows the path where each plugin is located."
3112
msgstr ""
3113
3114
#: bzrlib/builtins.py:4976
3115
msgid ""
3116
"A plugin is an external component for Bazaar that extends the\n"
3117
"revision control system, by adding or replacing code in Bazaar.\n"
3118
"Plugins can do a variety of things, including overriding commands,\n"
3119
"adding new commands, providing additional network transports and\n"
3120
"customizing log output."
3121
msgstr ""
3122
3123
#: bzrlib/builtins.py:4982
3124
msgid ""
3125
"See the Bazaar Plugin Guide <http://doc.bazaar.canonical.com/plugins/en/>\n"
3126
"for further information on plugins including where to find them and how to\n"
3127
"install them. Instructions are also provided there on how to write new\n"
3128
"plugins using the Python programming language."
3129
msgstr ""
3130
3131
#: bzrlib/builtins.py:4998
3132
msgid "Show testament (signing-form) of a revision."
3133
msgstr ""
3134
3135
#: bzrlib/builtins.py:5001
3136
msgid "Produce long-format testament."
3137
msgstr ""
3138
3139
#: bzrlib/builtins.py:5003
3140
msgid "Produce a strict-format testament."
3141
msgstr ""
3142
3143
#: bzrlib/builtins.py:5029
3144
msgid "Show the origin of each line in a file."
3145
msgstr ""
3146
3147
#: bzrlib/builtins.py:5031
3148
msgid ""
3149
"This prints out the given file with an annotation on the left side\n"
3150
"indicating which revision, author and date introduced the change."
3151
msgstr ""
3152
3153
#: bzrlib/builtins.py:5034
3154
msgid ""
3155
"If the origin is the same for a run of consecutive lines, it is\n"
3156
"shown only at the top, unless the --all option is given."
3157
msgstr ""
3158
3159
#: bzrlib/builtins.py:5042
3160
msgid "Show annotations on all lines."
3161
msgstr ""
3162
3163
#: bzrlib/builtins.py:5043
3164
msgid "Show commit date in annotations."
3165
msgstr ""
3166
3167
#: bzrlib/builtins.py:5130
3168
msgid "Cannot sign a range of non-revision-history revisions"
3169
msgstr ""
3170
3171
#: bzrlib/builtins.py:5142
3172
msgid "Please supply either one revision, or a range."
3173
msgstr ""
3174
3175
#: bzrlib/builtins.py:5146
3176
msgid ""
3177
"Convert the current branch into a checkout of the supplied branch.\n"
3178
"If no branch is supplied, rebind to the last bound location."
3179
msgstr ""
3180
3181
#: bzrlib/builtins.py:5149
3182
msgid ""
3183
"Once converted into a checkout, commits must succeed on the master branch\n"
3184
"before they will be applied to the local branch."
3185
msgstr ""
3186
3187
#: bzrlib/builtins.py:5152
3188
msgid ""
3189
"Bound branches use the nickname of its master branch unless it is set\n"
3190
"locally, in which case binding will update the local nickname to be\n"
3191
"that of the master."
3192
msgstr ""
3193
3194
#: bzrlib/builtins.py:5167
3195
msgid "No location supplied. This format does not remember old locations."
3196
msgstr ""
3197
3198
#: bzrlib/builtins.py:5172
3199
msgid "Branch is already bound"
3200
msgstr ""
3201
3202
#: bzrlib/builtins.py:5174
3203
msgid "No location supplied and no previous location known"
3204
msgstr ""
3205
3206
#: bzrlib/builtins.py:5180
3207
msgid "These branches have diverged. Try merging, and then bind again."
3208
msgstr ""
3209
3210
#: bzrlib/builtins.py:5187
3211
msgid "Convert the current checkout into a regular branch."
3212
msgstr ""
3213
3214
#: bzrlib/builtins.py:5189
3215
msgid ""
3216
"After unbinding, the local branch is considered independent and subsequent\n"
3217
"commits will be local only."
3218
msgstr ""
3219
3220
#: bzrlib/builtins.py:5200
3221
msgid "Local branch is not bound"
3222
msgstr ""
3223
3224
#: bzrlib/builtins.py:5204
3225
msgid "Remove the last committed revision."
3226
msgstr ""
3227
3228
#: bzrlib/builtins.py:5206
3229
msgid ""
3230
"--verbose will print out what is being removed.\n"
3231
"--dry-run will go through all the motions, but not actually\n"
3232
"remove anything."
3233
msgstr ""
3234
3235
#: bzrlib/builtins.py:5210
3236
msgid ""
3237
"If --revision is specified, uncommit revisions to leave the branch at the\n"
3238
"specified revision. For example, \"bzr uncommit -r 15\" will leave the\n"
3239
"branch at revision 15."
3240
msgstr ""
3241
3242
#: bzrlib/builtins.py:5214
3243
msgid ""
3244
"Uncommit leaves the working tree ready for a new commit. The only change\n"
3245
"it may make is to restore any pending merges that were present before\n"
3246
"the commit."
3247
msgstr ""
3248
3249
#: bzrlib/builtins.py:5225
3250
msgid "Don't actually make changes."
3251
msgstr ""
3252
3253
#: bzrlib/builtins.py:5226
3254
msgid "Say yes to all questions."
3255
msgstr ""
3256
3257
#: bzrlib/builtins.py:5228
3258
msgid "Keep tags that point to removed revisions."
3259
msgstr ""
3260
3261
#: bzrlib/builtins.py:5230
3262
msgid "Only remove the commits from the local branch when in a checkout."
3263
msgstr ""
3264
3265
#: bzrlib/builtins.py:5279
3266
msgid "No revisions to uncommit.\n"
3267
msgstr ""
3268
3269
#: bzrlib/builtins.py:5294
3270
msgid "Dry-run, pretending to remove the above revisions.\n"
3271
msgstr ""
3272
3273
#: bzrlib/builtins.py:5297
3274
msgid "The above revision(s) will be removed.\n"
3275
msgstr ""
3276
3277
#: bzrlib/builtins.py:5301
3278
msgid "Uncommit these revisions"
3279
msgstr ""
3280
3281
#: bzrlib/builtins.py:5304
3282
msgid "Canceled\n"
3283
msgstr ""
3284
3285
#: bzrlib/builtins.py:5311
3286
#, python-format
3287
msgid ""
3288
"You can restore the old tip by running:\n"
3289
" bzr pull . -r revid:%s\n"
3290
msgstr ""
3291
3292
#: bzrlib/builtins.py:5316
3293
msgid "Break a dead lock."
3294
msgstr ""
3295
3296
#: bzrlib/builtins.py:5318
3297
msgid ""
3298
"This command breaks a lock on a repository, branch, working directory or\n"
3299
"config file."
3300
msgstr ""
3301
3302
#: bzrlib/builtins.py:5321
3303
msgid ""
3304
"CAUTION: Locks should only be broken when you are sure that the process\n"
3305
"holding the lock has been stopped."
3306
msgstr ""
3307
3308
#: bzrlib/builtins.py:5324
3309
msgid ""
3310
"You can get information on what locks are open via the 'bzr info\n"
3311
"[location]' command."
3312
msgstr ""
3313
3314
#: bzrlib/builtins.py:5327
3315
msgid ""
3316
":Examples:\n"
3317
" bzr break-lock\n"
3318
" bzr break-lock bzr+ssh://example.com/bzr/foo\n"
3319
" bzr break-lock --conf ~/.bazaar"
3320
msgstr ""
3321
3322
#: bzrlib/builtins.py:5336
3323
msgid "LOCATION is the directory where the config lock is."
3324
msgstr ""
3325
3326
#: bzrlib/builtins.py:5338
3327
msgid "Do not ask for confirmation before breaking the lock."
3328
msgstr ""
3329
3330
#: bzrlib/builtins.py:5373
3331
msgid "The Bazaar smart server protocol over TCP. (default port: 4155)"
3332
msgstr ""
3333
3334
#: bzrlib/builtins.py:5374
3335
msgid "Run the bzr server."
3336
msgstr ""
3337
3338
#: bzrlib/builtins.py:5380
3339
msgid "Serve on stdin/out for use from inetd or sshd."
3340
msgstr ""
3341
3342
#: bzrlib/builtins.py:5381
3343
msgid "protocol"
3344
msgstr ""
3345
3346
#: bzrlib/builtins.py:5382
3347
msgid "Protocol to serve."
3348
msgstr ""
3349
3350
#: bzrlib/builtins.py:5386
3351
msgid ""
3352
"Listen for connections on nominated port of the form [hostname:]portnumber. "
3353
"Passing 0 as the port number will result in a dynamically allocated port. "
3354
"The default port depends on the protocol."
3355
msgstr ""
3356
3357
#: bzrlib/builtins.py:5392
3358
msgid "Serve contents of this directory."
3359
msgstr ""
3360
3361
#: bzrlib/builtins.py:5394
3362
msgid ""
3363
"By default the server is a readonly server. Supplying --allow-writes "
3364
"enables write access to the contents of the served directory and below. "
3365
"Note that ``bzr serve`` does not perform authentication, so unless some form "
3366
"of external authentication is arranged supplying this option leads to global "
3367
"uncontrolled write access to your file system."
3368
msgstr ""
3369
3370
#: bzrlib/builtins.py:5403
3371
msgid "Override the default idle client timeout (5min)."
3372
msgstr ""
3373
3374
#: bzrlib/builtins.py:5453
3375
msgid "Combine a tree into its containing tree."
3376
msgstr ""
3377
3378
#: bzrlib/builtins.py:5455
3379
msgid "This command requires the target tree to be in a rich-root format."
3380
msgstr ""
3381
3382
#: bzrlib/builtins.py:5457
3383
msgid ""
3384
"The TREE argument should be an independent tree, inside another tree, but\n"
3385
"not part of it. (Such trees can be produced by \"bzr split\", but also by\n"
3386
"running \"bzr branch\" with the target inside a tree.)"
3387
msgstr ""
3388
3389
#: bzrlib/builtins.py:5461
3390
msgid ""
3391
"The result is a combined tree, with the subtree no longer an independent\n"
3392
"part. This is marked as a merge of the subtree into the containing tree,\n"
3393
"and all history is preserved."
3394
msgstr ""
3395
3396
#: bzrlib/builtins.py:5479
3397
#, python-format
3398
msgid ""
3399
"Can't join trees because %s doesn't support rich root data.\n"
3400
"You can use bzr upgrade on the repository."
3401
msgstr ""
3402
3403
#: bzrlib/builtins.py:5489 bzrlib/builtins.py:5495
3404
msgid "Cannot join {0}. {1}"
3405
msgstr ""
3406
3407
#: bzrlib/builtins.py:5499
3408
msgid "Split a subdirectory of a tree into a separate tree."
3409
msgstr ""
3410
3411
#: bzrlib/builtins.py:5501
3412
msgid ""
3413
"This command will produce a target tree in a format that supports\n"
3414
"rich roots, like 'rich-root' or 'rich-root-pack'. These formats cannot be\n"
3415
"converted into earlier formats like 'dirstate-tags'."
3416
msgstr ""
3417
3418
#: bzrlib/builtins.py:5505
3419
msgid ""
3420
"The TREE argument should be a subdirectory of a working tree. That\n"
3421
"subdirectory will be converted into an independent tree, with its own\n"
3422
"branch. Commits in the top-level tree will not apply to the new subtree."
3423
msgstr ""
3424
3425
#: bzrlib/builtins.py:5585
3426
msgid "No submit branch specified or known"
3427
msgstr ""
3428
3429
#: bzrlib/builtins.py:5593 bzrlib/send.py:108
3430
msgid "No public branch specified or known"
3431
msgstr ""
3432
3433
#: bzrlib/builtins.py:5598
3434
msgid "bzr merge-directive takes at most two one revision identifiers"
3435
msgstr ""
3436
3437
#: bzrlib/builtins.py:5607
3438
msgid "No revisions to bundle."
3439
msgstr ""
3440
3441
#: bzrlib/builtins.py:5626
3442
msgid "Mail or create a merge-directive for submitting changes."
3443
msgstr ""
3444
3445
#: bzrlib/builtins.py:5628
3446
msgid "A merge directive provides many things needed for requesting merges:"
3447
msgstr ""
3448
3449
#: bzrlib/builtins.py:5630
3450
msgid "* A machine-readable description of the merge to perform"
3451
msgstr ""
3452
3453
#: bzrlib/builtins.py:5632
3454
msgid "* An optional patch that is a preview of the changes requested"
3455
msgstr ""
3456
3457
#: bzrlib/builtins.py:5634
3458
msgid ""
3459
"* An optional bundle of revision data, so that the changes can be applied\n"
3460
" directly from the merge directive, without retrieving data from a\n"
3461
" branch."
3462
msgstr ""
3463
3464
#: bzrlib/builtins.py:5638
3465
msgid ""
3466
"`bzr send` creates a compact data set that, when applied using bzr\n"
3467
"merge, has the same effect as merging from the source branch. "
3468
msgstr ""
3469
3470
#: bzrlib/builtins.py:5641
3471
msgid ""
3472
"By default the merge directive is self-contained and can be applied to any\n"
3473
"branch containing submit_branch in its ancestory without needing access to\n"
3474
"the source branch."
3475
msgstr ""
3476
3477
#: bzrlib/builtins.py:5645
3478
msgid ""
3479
"If --no-bundle is specified, then Bazaar doesn't send the contents of the\n"
3480
"revisions, but only a structured request to merge from the\n"
3481
"public_location. In that case the public_branch is needed and it must be\n"
3482
"up-to-date and accessible to the recipient. The public_branch is always\n"
3483
"included if known, so that people can check it later."
3484
msgstr ""
3485
3486
#: bzrlib/builtins.py:5651
3487
msgid ""
3488
"The submit branch defaults to the parent of the source branch, but can be\n"
3489
"overridden. Both submit branch and public branch will be remembered in\n"
3490
"branch.conf the first time they are used for a particular branch. The\n"
3491
"source branch defaults to that containing the working directory, but can\n"
3492
"be changed using --from."
3493
msgstr ""
3494
3495
#: bzrlib/builtins.py:5657
3496
msgid ""
3497
"Both the submit branch and the public branch follow the usual behavior with\n"
3498
"respect to --remember: If there is no default location set, the first send\n"
3499
"will set it (use --no-remember to avoid setting it). After that, you can\n"
3500
"omit the location to use the default. To change the default, use\n"
3501
"--remember. The value will only be saved if the location can be accessed."
3502
msgstr ""
3503
3504
#: bzrlib/builtins.py:5663
3505
msgid ""
3506
"In order to calculate those changes, bzr must analyse the submit branch.\n"
3507
"Therefore it is most efficient for the submit branch to be a local mirror.\n"
3508
"If a public location is known for the submit_branch, that location is used\n"
3509
"in the merge directive."
3510
msgstr ""
3511
3512
#: bzrlib/builtins.py:5668
3513
msgid ""
3514
"The default behaviour is to send the merge directive by mail, unless -o is\n"
3515
"given, in which case it is sent to a file."
3516
msgstr ""
3517
3518
#: bzrlib/builtins.py:5671
3519
msgid ""
3520
"Mail is sent using your preferred mail program. This should be transparent\n"
3521
"on Windows (it uses MAPI). On Unix, it requires the xdg-email utility.\n"
3522
"If the preferred client can't be found (or used), your editor will be used."
3523
msgstr ""
3524
3525
#: bzrlib/builtins.py:5675
3526
msgid ""
3527
"To use a specific mail program, set the mail_client configuration option.\n"
3528
"(For Thunderbird 1.5, this works around some bugs.) Supported values for\n"
3529
"specific clients are \"claws\", \"evolution\", \"kmail\", \"mail.app\" "
3530
"(MacOS X's\n"
3531
"Mail.app), \"mutt\", and \"thunderbird\"; generic options are \"default\",\n"
3532
"\"editor\", \"emacsclient\", \"mapi\", and \"xdg-email\". Plugins may also "
3533
"add\n"
3534
"supported clients."
3535
msgstr ""
3536
3537
#: bzrlib/builtins.py:5682
3538
msgid ""
3539
"If mail is being sent, a to address is required. This can be supplied\n"
3540
"either on the commandline, by setting the submit_to configuration\n"
3541
"option in the branch itself or the child_submit_to configuration option\n"
3542
"in the submit branch."
3543
msgstr ""
3544
3545
#: bzrlib/builtins.py:5687
3546
msgid ""
3547
"Two formats are currently supported: \"4\" uses revision bundle format 4 "
3548
"and\n"
3549
"merge directive format 2. It is significantly faster and smaller than\n"
3550
"older formats. It is compatible with Bazaar 0.19 and later. It is the\n"
3551
"default. \"0.9\" uses revision bundle format 0.9 and merge directive\n"
3552
"format 1. It is compatible with Bazaar 0.12 - 0.18."
3553
msgstr ""
3554
3555
#: bzrlib/builtins.py:5693
3556
msgid ""
3557
"The merge directives created by bzr send may be applied using bzr merge or\n"
3558
"bzr pull by specifying a file containing a merge directive as the location."
3559
msgstr ""
3560
3561
#: bzrlib/builtins.py:5696
3562
msgid ""
3563
"bzr send makes extensive use of public locations to map local locations "
3564
"into\n"
3565
"URLs that can be used by other people. See `bzr help configuration` to\n"
3566
"set them, and use `bzr info` to display them."
3567
msgstr ""
3568
3569
#: bzrlib/builtins.py:5720
3570
msgid "Write merge directive to this file or directory; use - for stdout."
3571
msgstr ""
3572
3573
#: bzrlib/builtins.py:5724
3574
msgid ""
3575
"Refuse to send if there are uncommitted changes in the working tree, --no-"
3576
"strict disables the check."
3577
msgstr ""
3578
3579
#: bzrlib/builtins.py:5726
3580
msgid "Mail the request to this address."
3581
msgstr ""
3582
3583
#: bzrlib/builtins.py:5730
3584
msgid "Body for the email."
3585
msgstr ""
3586
3587
#: bzrlib/builtins.py:5783
3588
msgid "Do not include a bundle in the merge directive."
3589
msgstr ""
3590
3591
#: bzrlib/builtins.py:5784
3592
msgid "Do not include a preview patch in the merge directive."
3593
msgstr ""
3594
3595
#: bzrlib/builtins.py:5787
3596
msgid "Remember submit and public branch."
3597
msgstr ""
3598
3599
#: bzrlib/builtins.py:5789
3600
msgid ""
3601
"Branch to generate the submission from, rather than the one containing the "
3602
"working directory."
3603
msgstr ""
3604
3605
#: bzrlib/builtins.py:5799 bzrlib/cmd_version_info.py:76
3606
msgid "format"
3607
msgstr ""
3608
3609
#: bzrlib/builtins.py:5800
3610
msgid "Use the specified output format."
3611
msgstr ""
3612
3613
#: bzrlib/builtins.py:5822
3614
msgid "Create, remove or modify a tag naming a revision."
3615
msgstr ""
3616
3617
#: bzrlib/builtins.py:5824
3618
msgid ""
3619
"Tags give human-meaningful names to revisions. Commands that take a -r\n"
3620
"(--revision) option can be given -rtag:X, where X is any previously\n"
3621
"created tag."
3622
msgstr ""
3623
3624
#: bzrlib/builtins.py:5828
3625
msgid ""
3626
"Tags are stored in the branch. Tags are copied from one branch to another\n"
3627
"along when you branch, push, pull or merge."
3628
msgstr ""
3629
3630
#: bzrlib/builtins.py:5831
3631
msgid ""
3632
"It is an error to give a tag name that already exists unless you pass\n"
3633
"--force, in which case the tag is moved to point to the new revision."
3634
msgstr ""
3635
3636
#: bzrlib/builtins.py:5834
3637
msgid ""
3638
"To rename a tag (change the name but keep it on the same revsion), run "
3639
"``bzr\n"
3640
"tag new-name -r tag:old-name`` and then ``bzr tag --delete oldname``."
3641
msgstr ""
3642
3643
#: bzrlib/builtins.py:5837
3644
msgid ""
3645
"If no tag name is specified it will be determined through the \n"
3646
"'automatic_tag_name' hook. This can e.g. be used to automatically tag\n"
3647
"upstream releases by reading configure.ac. See ``bzr help hooks`` for\n"
3648
"details."
3649
msgstr ""
3650
3651
#: bzrlib/builtins.py:5847
3652
msgid "Delete this tag rather than placing it."
3653
msgstr ""
3654
3655
#: bzrlib/builtins.py:5850
3656
msgid "Branch in which to place the tag."
3657
msgstr ""
3658
3659
#: bzrlib/builtins.py:5852
3660
msgid "Replace existing tags."
3661
msgstr ""
3662
3663
#: bzrlib/builtins.py:5867
3664
msgid "No tag specified to delete."
3665
msgstr ""
3666
3667
#: bzrlib/builtins.py:5869
3668
#, python-format
3669
msgid "Deleted tag %s."
3670
msgstr ""
3671
3672
#: bzrlib/builtins.py:5883
3673
msgid "Please specify a tag name."
3674
msgstr ""
3675
3676
#: bzrlib/builtins.py:5891
3677
#, python-format
3678
msgid "Tag %s already exists for that revision."
3679
msgstr ""
3680
3681
#: bzrlib/builtins.py:5895
3682
#, python-format
3683
msgid "Created tag %s."
3684
msgstr ""
3685
3686
#: bzrlib/builtins.py:5897
3687
#, python-format
3688
msgid "Updated tag %s."
3689
msgstr ""
3690
3691
#: bzrlib/builtins.py:5901
3692
msgid "List tags."
3693
msgstr ""
3694
3695
#: bzrlib/builtins.py:5903
3696
msgid ""
3697
"This command shows a table of tag names and the revisions they reference."
3698
msgstr ""
3699
3700
#: bzrlib/builtins.py:5909
3701
msgid "Branch whose tags should be displayed."
3702
msgstr ""
3703
3704
#: bzrlib/builtins.py:5911
3705
msgid "Sort tags by different criteria."
3706
msgstr ""
3707
3708
#: bzrlib/builtins.py:5911
3709
msgid "Sorting"
3710
msgstr ""
3711
3712
#: bzrlib/builtins.py:5980
3713
msgid "Reconfigure the type of a bzr directory."
3714
msgstr ""
3715
3716
#: bzrlib/builtins.py:5982
3717
msgid "A target configuration must be specified."
3718
msgstr ""
3719
3720
#: bzrlib/builtins.py:5984
3721
msgid ""
3722
"For checkouts, the bind-to location will be auto-detected if not specified.\n"
3723
"The order of preference is\n"
3724
"1. For a lightweight checkout, the current bound location.\n"
3725
"2. For branches that used to be checkouts, the previously-bound location.\n"
3726
"3. The push location.\n"
3727
"4. The parent location.\n"
3728
"If none of these is available, --bind-to must be specified."
3729
msgstr ""
3730
3731
#: bzrlib/builtins.py:5998
3732
msgid "Tree type"
3733
msgstr ""
3734
3735
#: bzrlib/builtins.py:5999
3736
msgid "The relation between branch and tree."
3737
msgstr ""
3738
3739
#: bzrlib/builtins.py:6001
3740
msgid "Reconfigure to be an unbound branch with no working tree."
3741
msgstr ""
3742
3743
#: bzrlib/builtins.py:6002
3744
msgid "Reconfigure to be an unbound branch with a working tree."
3745
msgstr ""
3746
3747
#: bzrlib/builtins.py:6003
3748
msgid "Reconfigure to be a bound branch with a working tree."
3749
msgstr ""
3750
3751
#: bzrlib/builtins.py:6004
3752
msgid "Reconfigure to be a lightweight checkout (with no local history)."
3753
msgstr ""
3754
3755
#: bzrlib/builtins.py:6009
3756
msgid "Repository type"
3757
msgstr ""
3758
3759
#: bzrlib/builtins.py:6010
3760
msgid "Location fo the repository."
3761
msgstr ""
3762
3763
#: bzrlib/builtins.py:6012
3764
msgid ""
3765
"Reconfigure to be a standalone branch (i.e. stop using shared repository)."
3766
msgstr ""
3767
3768
#: bzrlib/builtins.py:6014
3769
msgid "Reconfigure to use a shared repository."
3770
msgstr ""
3771
3772
#: bzrlib/builtins.py:6018
3773
msgid "Trees in Repository"
3774
msgstr ""
3775
3776
#: bzrlib/builtins.py:6019
3777
msgid "Whether new branches in the repository have trees."
3778
msgstr ""
3779
3780
#: bzrlib/builtins.py:6021
3781
msgid ""
3782
"Reconfigure repository to create working trees on branches by default."
3783
msgstr ""
3784
3785
#: bzrlib/builtins.py:6023
3786
msgid ""
3787
"Reconfigure repository to not create working trees on branches by default."
3788
msgstr ""
3789
3790
#: bzrlib/builtins.py:6026
3791
msgid "Branch to bind checkout to."
3792
msgstr ""
3793
3794
#: bzrlib/builtins.py:6028
3795
msgid "Perform reconfiguration even if local changes will be lost."
3796
msgstr ""
3797
3798
#: bzrlib/builtins.py:6031
3799
msgid "Reconfigure a branch to be stacked on another branch."
3800
msgstr ""
3801
3802
#: bzrlib/builtins.py:6035
3803
msgid ""
3804
"Reconfigure a branch to be unstacked. This may require copying substantial "
3805
"data into it."
3806
msgstr ""
3807
3808
#: bzrlib/builtins.py:6045
3809
msgid "Can't use both --stacked-on and --unstacked"
3810
msgstr ""
3811
3812
#: bzrlib/builtins.py:6059
3813
msgid "No target configuration specified"
3814
msgstr ""
3815
3816
#: bzrlib/builtins.py:6094
3817
msgid "Set the branch of a checkout and update."
3818
msgstr ""
3819
3820
#: bzrlib/builtins.py:6096
3821
msgid ""
3822
"For lightweight checkouts, this changes the branch being referenced.\n"
3823
"For heavyweight checkouts, this checks that there are no local commits\n"
3824
"versus the current bound branch, then it makes the local branch a mirror\n"
3825
"of the new location and binds to it."
3826
msgstr ""
3827
3828
#: bzrlib/builtins.py:6101
3829
msgid ""
3830
"In both cases, the working tree is updated and uncommitted changes\n"
3831
"are merged. The user can commit or revert these as they desire."
3832
msgstr ""
3833
3834
#: bzrlib/builtins.py:6104
3835
msgid "Pending merges need to be committed or reverted before using switch."
3836
msgstr ""
3837
3838
#: bzrlib/builtins.py:6106
3839
msgid ""
3840
"The path to the branch to switch to can be specified relative to the parent\n"
3841
"directory of the current branch. For example, if you are currently in a\n"
3842
"checkout of /path/to/branch, specifying 'newbranch' will find a branch at\n"
3843
"/path/to/newbranch."
3844
msgstr ""
3845
3846
#: bzrlib/builtins.py:6111
3847
msgid ""
3848
"Bound branches use the nickname of its master branch unless it is set\n"
3849
"locally, in which case switching will update the local nickname to be\n"
3850
"that of the master."
3851
msgstr ""
3852
3853
#: bzrlib/builtins.py:6119
3854
msgid "Switch even if local commits will be lost."
3855
msgstr ""
3856
3857
#: bzrlib/builtins.py:6122
3858
msgid "Create the target branch from this one before switching to it."
3859
msgstr ""
3860
3861
#: bzrlib/builtins.py:6134
3862
msgid "You must supply either a revision or a location"
3863
msgstr ""
3864
3865
#: bzrlib/builtins.py:6145
3866
msgid "cannot create branch without source branch"
3867
msgstr ""
3868
3869
#: bzrlib/builtins.py:6209
3870
msgid "Manage filtered views."
3871
msgstr ""
3872
3873
#: bzrlib/builtins.py:6211
3874
msgid ""
3875
"Views provide a mask over the tree so that users can focus on\n"
3876
"a subset of a tree when doing their work. After creating a view,\n"
3877
"commands that support a list of files - status, diff, commit, etc -\n"
3878
"effectively have that list of files implicitly given each time.\n"
3879
"An explicit list of files can still be given but those files\n"
3880
"must be within the current view."
3881
msgstr ""
3882
3883
#: bzrlib/builtins.py:6218
3884
msgid ""
3885
"In most cases, a view has a short life-span: it is created to make\n"
3886
"a selected change and is deleted once that change is committed.\n"
3887
"At other times, you may wish to create one or more named views\n"
3888
"and switch between them."
3889
msgstr ""
3890
3891
#: bzrlib/builtins.py:6223
3892
msgid ""
3893
"To disable the current view without deleting it, you can switch to\n"
3894
"the pseudo view called ``off``. This can be useful when you need\n"
3895
"to see the whole tree for an operation or two (e.g. merge) but\n"
3896
"want to switch back to your view after that."
3897
msgstr ""
3898
3899
#: bzrlib/builtins.py:6228
3900
msgid ""
3901
":Examples:\n"
3902
" To define the current view::"
3903
msgstr ""
3904
3905
#: bzrlib/builtins.py:6231
3906
msgid " bzr view file1 dir1 ..."
3907
msgstr ""
3908
3909
#: bzrlib/builtins.py:6233
3910
msgid " To list the current view::"
3911
msgstr ""
3912
3913
#: bzrlib/builtins.py:6235
3914
msgid " bzr view"
3915
msgstr ""
3916
3917
#: bzrlib/builtins.py:6237
3918
msgid " To delete the current view::"
3919
msgstr ""
3920
3921
#: bzrlib/builtins.py:6239
3922
msgid " bzr view --delete"
3923
msgstr ""
3924
3925
#: bzrlib/builtins.py:6241
3926
msgid " To disable the current view without deleting it::"
3927
msgstr ""
3928
3929
#: bzrlib/builtins.py:6243
3930
msgid " bzr view --switch off"
3931
msgstr ""
3932
3933
#: bzrlib/builtins.py:6245
3934
msgid " To define a named view and switch to it::"
3935
msgstr ""
3936
3937
#: bzrlib/builtins.py:6247
3938
msgid " bzr view --name view-name file1 dir1 ..."
3939
msgstr ""
3940
3941
#: bzrlib/builtins.py:6249
3942
msgid " To list a named view::"
3943
msgstr ""
3944
3945
#: bzrlib/builtins.py:6251
3946
msgid " bzr view --name view-name"
3947
msgstr ""
3948
3949
#: bzrlib/builtins.py:6253
3950
msgid " To delete a named view::"
3951
msgstr ""
3952
3953
#: bzrlib/builtins.py:6255
3954
msgid " bzr view --name view-name --delete"
3955
msgstr ""
3956
3957
#: bzrlib/builtins.py:6257
3958
msgid " To switch to a named view::"
3959
msgstr ""
3960
3961
#: bzrlib/builtins.py:6259
3962
msgid " bzr view --switch view-name"
3963
msgstr ""
3964
3965
#: bzrlib/builtins.py:6261
3966
msgid " To list all views defined::"
3967
msgstr ""
3968
3969
#: bzrlib/builtins.py:6263
3970
msgid " bzr view --all"
3971
msgstr ""
3972
3973
#: bzrlib/builtins.py:6265
3974
msgid " To delete all views::"
3975
msgstr ""
3976
3977
#: bzrlib/builtins.py:6267
3978
msgid " bzr view --delete --all"
3979
msgstr ""
3980
3981
#: bzrlib/builtins.py:6274
3982
msgid "Apply list or delete action to all views."
3983
msgstr ""
3984
3985
#: bzrlib/builtins.py:6277
3986
msgid "Delete the view."
3987
msgstr ""
3988
3989
#: bzrlib/builtins.py:6280
3990
msgid "Name of the view to define, list or delete."
3991
msgstr ""
3992
3993
#: bzrlib/builtins.py:6284
3994
msgid "Name of the view to switch to."
3995
msgstr ""
3996
3997
#: bzrlib/builtins.py:6303
3998
msgid "Both --delete and a file list specified"
3999
msgstr ""
4000
4001
#: bzrlib/builtins.py:6306
4002
msgid "Both --delete and --switch specified"
4003
msgstr ""
4004
4005
#: bzrlib/builtins.py:6309
4006
msgid "Deleted all views.\n"
4007
msgstr ""
4008
4009
#: bzrlib/builtins.py:6311
4010
msgid "No current view to delete"
4011
msgstr ""
4012
4013
#: bzrlib/builtins.py:6314
4014
#, python-format
4015
msgid "Deleted '%s' view.\n"
4016
msgstr ""
4017
4018
#: bzrlib/builtins.py:6318
4019
msgid "Both --switch and a file list specified"
4020
msgstr ""
4021
4022
#: bzrlib/builtins.py:6321
4023
msgid "Both --switch and --all specified"
4024
msgstr ""
4025
4026
#: bzrlib/builtins.py:6324
4027
msgid "No current view to disable"
4028
msgstr ""
4029
4030
#: bzrlib/builtins.py:6326
4031
#, python-format
4032
msgid "Disabled '%s' view.\n"
4033
msgstr ""
4034
4035
#: bzrlib/builtins.py:6330 bzrlib/builtins.py:6352
4036
msgid "Using '{0}' view: {1}\n"
4037
msgstr ""
4038
4039
#: bzrlib/builtins.py:6333
4040
msgid "Views defined:\n"
4041
msgstr ""
4042
4043
#: bzrlib/builtins.py:6342
4044
msgid "No views defined.\n"
4045
msgstr ""
4046
4047
#: bzrlib/builtins.py:6349
4048
msgid "Cannot change the 'off' pseudo view"
4049
msgstr ""
4050
4051
#: bzrlib/builtins.py:6357
4052
msgid "No current view.\n"
4053
msgstr ""
4054
4055
#: bzrlib/builtins.py:6360
4056
msgid "'{0}' view is: {1}\n"
4057
msgstr ""
4058
4059
#: bzrlib/builtins.py:6380
4060
msgid " <no hooks installed>\n"
4061
msgstr ""
4062
4063
#: bzrlib/builtins.py:6384
4064
msgid "Remove a branch."
4065
msgstr ""
4066
4067
#: bzrlib/builtins.py:6386
4068
msgid ""
4069
"This will remove the branch from the specified location but \n"
4070
"will keep any working tree or repository in place."
4071
msgstr ""
4072
4073
#: bzrlib/builtins.py:6391
4074
msgid " Remove the branch at repo/trunk::"
4075
msgstr ""
4076
4077
#: bzrlib/builtins.py:6393
4078
msgid " bzr remove-branch repo/trunk"
4079
msgstr ""
4080
4081
#: bzrlib/builtins.py:6408
4082
msgid "Plaintext diff output."
4083
msgstr ""
4084
4085
#: bzrlib/builtins.py:6409
4086
msgid "Temporarily set aside some changes from the current tree."
4087
msgstr ""
4088
4089
#: bzrlib/builtins.py:6411
4090
msgid ""
4091
"Shelve allows you to temporarily put changes you've made \"on the shelf\",\n"
4092
"ie. out of the way, until a later time when you can bring them back from\n"
4093
"the shelf with the 'unshelve' command. The changes are stored alongside\n"
4094
"your working tree, and so they aren't propagated along with your branch nor\n"
4095
"will they survive its deletion."
4096
msgstr ""
4097
4098
#: bzrlib/builtins.py:6417
4099
msgid "If shelve --list is specified, previously-shelved changes are listed."
4100
msgstr ""
4101
4102
#: bzrlib/builtins.py:6419
4103
msgid ""
4104
"Shelve is intended to help separate several sets of changes that have\n"
4105
"been inappropriately mingled. If you just want to get rid of all changes\n"
4106
"and you don't need to restore them later, use revert. If you want to\n"
4107
"shelve all text changes at once, use shelve --all."
4108
msgstr ""
4109
4110
#: bzrlib/builtins.py:6424
4111
msgid ""
4112
"If filenames are specified, only the changes to those files will be\n"
4113
"shelved. Other files will be left untouched."
4114
msgstr ""
4115
4116
#: bzrlib/builtins.py:6427
4117
msgid ""
4118
"If a revision is specified, changes since that revision will be shelved."
4119
msgstr ""
4120
4121
#: bzrlib/builtins.py:6429
4122
msgid ""
4123
"You can put multiple items on the shelf, and by default, 'unshelve' will\n"
4124
"restore the most recently shelved changes."
4125
msgstr ""
4126
4127
#: bzrlib/builtins.py:6432
4128
msgid ""
4129
"For complicated changes, it is possible to edit the changes in a separate\n"
4130
"editor program to decide what the file remaining in the working copy\n"
4131
"should look like. To do this, add the configuration option"
4132
msgstr ""
4133
4134
#: bzrlib/builtins.py:6436
4135
msgid " change_editor = PROGRAM @new_path @old_path"
4136
msgstr ""
4137
4138
#: bzrlib/builtins.py:6438
4139
msgid ""
4140
"where @new_path is replaced with the path of the new version of the \n"
4141
"file and @old_path is replaced with the path of the old version of \n"
4142
"the file. The PROGRAM should save the new file with the desired \n"
4143
"contents of the file in the working tree.\n"
4144
" "
4145
msgstr ""
4146
4147
#: bzrlib/builtins.py:6450
4148
msgid "Shelve all changes."
4149
msgstr ""
4150
4151
#: bzrlib/builtins.py:6452
4152
msgid "Method to use for writing diffs."
4153
msgstr ""
4154
4155
#: bzrlib/builtins.py:6452
4156
msgid "writer"
4157
msgstr ""
4158
4159
#: bzrlib/builtins.py:6456
4160
msgid "List shelved changes."
4161
msgstr ""
4162
4163
#: bzrlib/builtins.py:6458
4164
msgid "Destroy removed changes instead of shelving them."
4165
msgstr ""
4166
4167
#: bzrlib/builtins.py:6487
4168
msgid "No shelved changes."
4169
msgstr ""
4170
4171
#: bzrlib/builtins.py:6498
4172
msgid "Restore shelved changes."
4173
msgstr ""
4174
4175
#: bzrlib/builtins.py:6500
4176
msgid ""
4177
"By default, the most recently shelved changes are restored. However if you\n"
4178
"specify a shelf by id those changes will be restored instead. This works\n"
4179
"best when the changes don't depend on each other."
4180
msgstr ""
4181
4182
#: bzrlib/builtins.py:6509
4183
msgid "The action to perform."
4184
msgstr ""
4185
4186
#: bzrlib/builtins.py:6509 bzrlib/conflicts.py:694
4187
msgid "action"
4188
msgstr ""
4189
4190
#: bzrlib/builtins.py:6511
4191
msgid "Apply changes and remove from the shelf."
4192
msgstr ""
4193
4194
#: bzrlib/builtins.py:6512
4195
msgid "Show changes, but do not apply or remove them."
4196
msgstr ""
4197
4198
#: bzrlib/builtins.py:6513
4199
msgid ""
4200
"Instead of unshelving the changes, show the diff that would result from "
4201
"unshelving."
4202
msgstr ""
4203
4204
#: bzrlib/builtins.py:6515
4205
msgid "Delete changes without applying them."
4206
msgstr ""
4207
4208
#: bzrlib/builtins.py:6516
4209
msgid "Apply changes but don't delete them."
4210
msgstr ""
4211
4212
#: bzrlib/builtins.py:6531
4213
msgid "Remove unwanted files from working tree."
4214
msgstr ""
4215
4216
#: bzrlib/builtins.py:6533
4217
msgid ""
4218
"By default, only unknown files, not ignored files, are deleted. Versioned\n"
4219
"files are never deleted."
4220
msgstr ""
4221
4222
#: bzrlib/builtins.py:6536
4223
msgid ""
4224
"Another class is 'detritus', which includes files emitted by bzr during\n"
4225
"normal operations and selftests. (The value of these files decreases with\n"
4226
"time.)"
4227
msgstr ""
4228
4229
#: bzrlib/builtins.py:6540
4230
msgid ""
4231
"If no options are specified, unknown files are deleted. Otherwise, option\n"
4232
"flags are respected, and may be combined."
4233
msgstr ""
4234
4235
#: bzrlib/builtins.py:6543
4236
msgid "To check what clean-tree will do, use --dry-run."
4237
msgstr ""
4238
4239
#: bzrlib/builtins.py:6546
4240
msgid "Delete all ignored files."
4241
msgstr ""
4242
4243
#: bzrlib/builtins.py:6547
4244
msgid ""
4245
"Delete conflict files, merge and revert backups, and failed selftest dirs."
4246
msgstr ""
4247
4248
#: bzrlib/builtins.py:6550
4249
msgid "Delete files unknown to bzr (default)."
4250
msgstr ""
4251
4252
#: bzrlib/builtins.py:6551
4253
msgid "Show files to delete instead of deleting them."
4254
msgstr ""
4255
4256
#: bzrlib/builtins.py:6553
4257
msgid "Do not prompt before deleting."
4258
msgstr ""
4259
4260
#: bzrlib/bundle/__init__.py:59
4261
msgid "A directory cannot be a bundle"
4262
msgstr ""
4263
4264
#: bzrlib/bundle/apply_bundle.py:40
4265
msgid "Install revisions"
4266
msgstr ""
4267
4268
#: bzrlib/bundle/commands.py:64
4269
msgid "--verbose requires a merge directive"
4270
msgstr ""
4271
4272
#: bzrlib/bundle/commands.py:67
4273
msgid "Bundle format not supported"
4274
msgstr ""
4275
4276
#: bzrlib/bundle/commands.py:77
4277
msgid "Records\n"
4278
msgstr ""
4279
4280
#: bzrlib/bundle/commands.py:81
4281
msgid "{0}: {1} ({2} multiparent)\n"
4282
msgstr ""
4283
4284
#: bzrlib/bundle/commands.py:83
4285
#, python-format
4286
msgid "unique files: %d\n"
4287
msgstr ""
4288
4289
#: bzrlib/bundle/commands.py:92
4290
msgid "Revisions\n"
4291
msgstr ""
4292
4293
#: bzrlib/bundle/commands.py:93
4294
#, python-format
4295
msgid "nicks: %s\n"
4296
msgstr ""
4297
4298
#: bzrlib/bundle/commands.py:95
4299
#, python-format
4300
msgid ""
4301
"committers: \n"
4302
"%s\n"
4303
msgstr ""
4304
4305
#: bzrlib/bundle/commands.py:103
4306
msgid "Decoded contents\n"
4307
msgstr ""
4308
4309
#: bzrlib/bundle/serializer/v4.py:327
4310
#, python-format
4311
msgid "Bundling %d revision."
4312
msgid_plural "Bundling %d revisions."
4313
msgstr[0] ""
4314
msgstr[1] ""
4315
4316
#: bzrlib/bzrdir.py:489
4317
msgid ""
4318
"making backup of {0}\n"
4319
" to {1}"
4320
msgstr ""
4321
4322
#: bzrlib/bzrdir.py:512
4323
msgid "renamed {0} to {1}"
4324
msgstr ""
4325
4326
#: bzrlib/bzrdir.py:1663
4327
#, python-format
4328
msgid ""
4329
"Source repository format does not support stacking, using format:\n"
4330
" %s"
4331
msgstr ""
4332
4333
#: bzrlib/bzrdir.py:1683
4334
#, python-format
4335
msgid ""
4336
"Source branch format does not support stacking, using format:\n"
4337
" %s"
4338
msgstr ""
4339
4340
#: bzrlib/bzrdir.py:1829
4341
msgid "starting repository conversion"
4342
msgstr ""
4343
4344
#: bzrlib/bzrdir.py:2058
4345
msgid "Using default stacking branch {0} at {1}"
4346
msgstr ""
4347
4348
#: bzrlib/check.py:108
4349
msgid "check"
4350
msgstr ""
4351
4352
#: bzrlib/check.py:110
4353
msgid "checking revisions"
4354
msgstr ""
4355
4356
#: bzrlib/check.py:112
4357
msgid "checking commit contents"
4358
msgstr ""
4359
4360
#: bzrlib/check.py:114
4361
msgid "checking file graphs"
4362
msgstr ""
4363
4364
#: bzrlib/check.py:118
4365
msgid "checking branches and trees"
4366
msgstr ""
4367
4368
#: bzrlib/check.py:205
4369
msgid "checked repository {0} format {1}"
4370
msgstr ""
4371
4372
#: bzrlib/check.py:208
4373
#, python-format
4374
msgid "%6d revisions"
4375
msgstr ""
4376
4377
#: bzrlib/check.py:209
4378
#, python-format
4379
msgid "%6d file-ids"
4380
msgstr ""
4381
4382
#: bzrlib/check.py:211
4383
#, python-format
4384
msgid "%6d unreferenced text versions"
4385
msgstr ""
4386
4387
#: bzrlib/check.py:215
4388
msgid "unreferenced version: {{{0}}} in {1}"
4389
msgstr ""
4390
4391
#: bzrlib/check.py:218
4392
#, python-format
4393
msgid "%6d revisions are missing inventory_sha1"
4394
msgstr ""
4395
4396
#: bzrlib/check.py:221
4397
#, python-format
4398
msgid "%6d revisions are mentioned but not present"
4399
msgstr ""
4400
4401
#: bzrlib/check.py:224
4402
#, python-format
4403
msgid "%6d ghost revisions"
4404
msgstr ""
4405
4406
#: bzrlib/check.py:229
4407
#, python-format
4408
msgid "%6d revisions missing parents in ancestry"
4409
msgstr ""
4410
4411
#: bzrlib/check.py:233
4412
#, python-format
4413
msgid " %s should be in the ancestry for:"
4414
msgstr ""
4415
4416
#: bzrlib/check.py:237
4417
#, python-format
4418
msgid "%6d inconsistent parents"
4419
msgstr ""
4420
4421
#: bzrlib/check.py:241
4422
msgid " * {0} version {1} has parents {2!r} but should have {3!r}"
4423
msgstr ""
4424
4425
#: bzrlib/check.py:247
4426
#, python-format
4427
msgid "%6d revisions have incorrect parents in the revision index"
4428
msgstr ""
4429
4430
#: bzrlib/check.py:253
4431
msgid " {0} has wrong parents in index: {1!r} should be {2!r}"
4432
msgstr ""
4433
4434
#: bzrlib/check.py:267
4435
msgid "Mismatched internal revid {{{0}}} and index revid {{{1}}}"
4436
msgstr ""
4437
4438
#: bzrlib/check.py:296
4439
msgid ""
4440
"Multiple expected sha1s for {0}. {{{1}}} expects {{{2}}}, {{{3}}} expects "
4441
"{{{4}}}"
4442
msgstr ""
4443
4444
#: bzrlib/check.py:354
4445
#, python-format
4446
msgid "Checking branch at '%s'."
4447
msgstr ""
4448
4449
#: bzrlib/check.py:374
4450
#, python-format
4451
msgid "Checking working tree at '%s'."
4452
msgstr ""
4453
4454
#: bzrlib/check.py:427 bzrlib/check.py:441
4455
msgid "No branch found at specified location."
4456
msgstr ""
4457
4458
#: bzrlib/check.py:429 bzrlib/check.py:439
4459
msgid "No working tree found at specified location."
4460
msgstr ""
4461
4462
#: bzrlib/check.py:432
4463
#, python-format
4464
msgid "Checking repository at '%s'."
4465
msgstr ""
4466
4467
#: bzrlib/check.py:443
4468
msgid "No repository found at specified location."
4469
msgstr ""
4470
4471
#: bzrlib/clean_tree.py:63
4472
msgid "Nothing to delete."
4473
msgstr ""
4474
4475
#: bzrlib/clean_tree.py:68
4476
msgid "Are you sure you wish to delete these"
4477
msgstr ""
4478
4479
#: bzrlib/clean_tree.py:70
4480
msgid "Canceled"
4481
msgstr ""
4482
4483
#: bzrlib/clean_tree.py:107
4484
#, python-format
4485
msgid "unable to remove %s"
4486
msgstr ""
4487
4488
#: bzrlib/clean_tree.py:111
4489
msgid "deleting paths:"
4490
msgstr ""
4491
4492
#: bzrlib/clean_tree.py:125
4493
msgid "unable to remove \"{0}\": {1}."
4494
msgstr ""
4495
4496
#: bzrlib/clean_tree.py:130
4497
msgid "No files deleted."
4498
msgstr ""
4499
4500
#: bzrlib/cmd_version_info.py:47
4501
msgid "No known version info format {0}. Supported types are: {1}"
4502
msgstr ""
4503
4504
#: bzrlib/cmd_version_info.py:52
4505
msgid "Version info in Custom template-based format."
4506
msgstr ""
4507
4508
#: bzrlib/cmd_version_info.py:52
4509
msgid "Version info in Python format."
4510
msgstr ""
4511
4512
#: bzrlib/cmd_version_info.py:52
4513
msgid "Version info in RIO (simple text) format (default)."
4514
msgstr ""
4515
4516
#: bzrlib/cmd_version_info.py:53
4517
msgid "Show version information about this tree."
4518
msgstr ""
4519
4520
#: bzrlib/cmd_version_info.py:55
4521
msgid ""
4522
"You can use this command to add information about version into\n"
4523
"source code of an application. The output can be in one of the\n"
4524
"supported formats or in a custom format based on a template."
4525
msgstr ""
4526
4527
#: bzrlib/cmd_version_info.py:59 en/help_topics/configuration.txt:700
4528
#: en/help_topics/configuration.txt:710
4529
msgid "For example::"
4530
msgstr ""
4531
4532
#: bzrlib/cmd_version_info.py:61
4533
msgid ""
4534
" bzr version-info --custom \\\n"
4535
" --template=\"#define VERSION_INFO \\\"Project 1.2.3 (r{revno})\\\"\\n\""
4536
msgstr ""
4537
4538
#: bzrlib/cmd_version_info.py:64
4539
msgid ""
4540
"will produce a C header file with formatted string containing the\n"
4541
"current revision number. Other supported variables in templates are:"
4542
msgstr ""
4543
4544
#: bzrlib/cmd_version_info.py:67
4545
msgid ""
4546
" * {date} - date of the last revision\n"
4547
" * {build_date} - current date\n"
4548
" * {revno} - revision number\n"
4549
" * {revision_id} - revision id\n"
4550
" * {branch_nick} - branch nickname\n"
4551
" * {clean} - 0 if the source tree contains uncommitted changes,\n"
4552
" otherwise 1"
4553
msgstr ""
4554
4555
#: bzrlib/cmd_version_info.py:77
4556
msgid "Select the output format."
4557
msgstr ""
4558
4559
#: bzrlib/cmd_version_info.py:81
4560
msgid "Include all possible information."
4561
msgstr ""
4562
4563
#: bzrlib/cmd_version_info.py:82
4564
msgid "Check if tree is clean."
4565
msgstr ""
4566
4567
#: bzrlib/cmd_version_info.py:84
4568
msgid "Include the revision-history."
4569
msgstr ""
4570
4571
#: bzrlib/cmd_version_info.py:86
4572
msgid "Include the last revision for each file."
4573
msgstr ""
4574
4575
#: bzrlib/cmd_version_info.py:87
4576
msgid "Template for the output."
4577
msgstr ""
4578
4579
#: bzrlib/cmd_version_info.py:101
4580
msgid "bzr version-info --revision takes exactly one revision specifier"
4581
msgstr ""
4582
4583
#: bzrlib/commands.py:228
4584
#, python-format
4585
msgid "unknown command \"%s\""
4586
msgstr ""
4587
4588
#: bzrlib/commands.py:475
4589
msgid "No help for this command."
4590
msgstr ""
4591
4592
#: bzrlib/commands.py:488
4593
#, python-format
4594
msgid ":Purpose: %s\n"
4595
msgstr ""
4596
4597
#: bzrlib/commands.py:490
4598
#, python-format
4599
msgid ""
4600
":Usage:\n"
4601
"%s\n"
4602
msgstr ""
4603
4604
#: bzrlib/commands.py:492
4605
#, python-format
4606
msgid ":Usage: %s\n"
4607
msgstr ""
4608
4609
#: bzrlib/commands.py:511
4610
#, python-format
4611
msgid ":Options:%s"
4612
msgstr ""
4613
4614
#: bzrlib/commands.py:522
4615
#, python-format
4616
msgid ""
4617
":Description:\n"
4618
" %s\n"
4619
"\n"
4620
msgstr ""
4621
4622
#: bzrlib/commands.py:532
4623
#, python-format
4624
msgid ""
4625
"See bzr help %s for more details and examples.\n"
4626
"\n"
4627
msgstr ""
4628
4629
#: bzrlib/commands.py:537
4630
msgid ":Aliases: "
4631
msgstr ""
4632
4633
#: bzrlib/commands.py:541
4634
#, python-format
4635
msgid ":From: plugin \"%s\"\n"
4636
msgstr ""
4637
4638
#: bzrlib/commands.py:553
4639
msgid ":doc:`{0} <{1}-help>`"
4640
msgstr ""
4641
4642
#: bzrlib/commands.py:557
4643
#, python-format
4644
msgid ":See also: %s"
4645
msgstr ""
4646
4647
#: bzrlib/commands.py:815 bzrlib/gpg.py:324
4648
msgid "Only ASCII permitted in option names"
4649
msgstr ""
4650
4651
#: bzrlib/commands.py:840 bzrlib/commands.py:848
4652
msgid "command {0!r} needs one or more {1}"
4653
msgstr ""
4654
4655
#: bzrlib/commands.py:857
4656
msgid "command {0!r} requires argument {1}"
4657
msgstr ""
4658
4659
#: bzrlib/commands.py:864
4660
msgid "extra argument to command {0}: {1}"
4661
msgstr ""
4662
4663
#: bzrlib/commands.py:961
4664
#, python-format
4665
msgid "Profile data written to \"%s\"."
4666
msgstr ""
4667
4668
#: bzrlib/commit.py:117 bzrlib/commit.py:740
4669
msgid "added"
4670
msgstr ""
4671
4672
#: bzrlib/commit.py:117 bzrlib/commit.py:748
4673
msgid "modified"
4674
msgstr ""
4675
4676
#: bzrlib/commit.py:131
4677
#, python-format
4678
msgid "Committing%s"
4679
msgstr ""
4680
4681
#: bzrlib/commit.py:134
4682
#, python-format
4683
msgid "Committed revision %d."
4684
msgstr ""
4685
4686
#: bzrlib/commit.py:143
4687
#, python-format
4688
msgid "deleted %s"
4689
msgstr ""
4690
4691
#: bzrlib/commit.py:146
4692
#, python-format
4693
msgid "missing %s"
4694
msgstr ""
4695
4696
#: bzrlib/commit.py:511
4697
msgid ""
4698
"Conflicting tags in bound branch:\n"
4699
"{0}"
4700
msgstr ""
4701
4702
#: bzrlib/commit.py:742
4703
msgid "renamed"
4704
msgstr ""
4705
4706
#: bzrlib/commit.py:977
4707
msgid "unchanged"
4708
msgstr ""
4709
4710
#: bzrlib/commit.py:999
4711
msgid "{0} [{1}] - Stage"
4712
msgstr ""
4713
4714
#: bzrlib/commit.py:1002
4715
#, python-format
4716
msgid "%s - Stage"
4717
msgstr ""
4718
4719
#: bzrlib/commit_signature_commands.py:36
4720
msgid "Sign all commits by a given committer."
4721
msgstr ""
4722
4723
#: bzrlib/commit_signature_commands.py:38
4724
msgid ""
4725
"If location is not specified the local tree is used.\n"
4726
"If committer is not specified the default committer is used."
4727
msgstr ""
4728
4729
#: bzrlib/commit_signature_commands.py:41
4730
msgid "This does not sign commits that already have signatures."
4731
msgstr ""
4732
4733
#: bzrlib/commit_signature_commands.py:49
4734
msgid ""
4735
"Don't actually sign anything, just print the revisions that would be signed."
4736
msgstr ""
4737
4738
#: bzrlib/commit_signature_commands.py:103
4739
msgid "Verify all commit signatures."
4740
msgstr ""
4741
4742
#: bzrlib/commit_signature_commands.py:105
4743
msgid ""
4744
"Verifies that all commits in the branch are signed by known GnuPG keys."
4745
msgstr ""
4746
4747
#: bzrlib/commit_signature_commands.py:110
4748
msgid ""
4749
"Comma separated list of GPG key patterns which are acceptable for "
4750
"verification."
4751
msgstr ""
4752
4753
#: bzrlib/commit_signature_commands.py:147
4754
msgid "Cannot verify a range of non-revision-history revisions"
4755
msgstr ""
4756
4757
#: bzrlib/commit_signature_commands.py:168
4758
msgid "All commits signed with verifiable keys"
4759
msgstr ""
4760
4761
#: bzrlib/config.py:475
4762
msgid "Invalid config value for \"{0}\" value {1!r} is not an SI unit."
4763
msgstr ""
4764
4765
#: bzrlib/config.py:2499
4766
msgid "{0} is not an SI unit."
4767
msgstr ""
4768
4769
#: bzrlib/config.py:2956
4770
msgid ""
4771
"Option {0} in section {1} of {2} was changed from {3} to {4}. The {5} value "
4772
"will be saved."
4773
msgstr ""
4774
4775
#: bzrlib/config.py:3100
4776
#, python-format
4777
msgid "Invalid '%s', should be of the form 'name=value'"
4778
msgstr ""
4779
4780
#: bzrlib/config.py:3969
4781
msgid "Display, set or remove a configuration option."
4782
msgstr ""
4783
4784
#: bzrlib/config.py:3971
4785
msgid "Display the active value for a given option."
4786
msgstr ""
4787
4788
#: bzrlib/config.py:3973
4789
msgid ""
4790
"If --all is specified, NAME is interpreted as a regular expression and all\n"
4791
"matching options are displayed mentioning their scope. The active value\n"
4792
"that bzr will take into account is the first one displayed for each option."
4793
msgstr ""
4794
4795
#: bzrlib/config.py:3977
4796
msgid "If no NAME is given, --all .* is implied."
4797
msgstr ""
4798
4799
#: bzrlib/config.py:3979
4800
msgid ""
4801
"Setting a value is achieved by using name=value without spaces. The value\n"
4802
"is set in the most relevant scope and can be checked by displaying the\n"
4803
"option again."
4804
msgstr ""
4805
4806
#: bzrlib/config.py:3991
4807
msgid "Reduce the scope to the specified configuration file."
4808
msgstr ""
4809
4810
#: bzrlib/config.py:3995
4811
msgid "Display all the defined values for the matching options."
4812
msgstr ""
4813
4814
#: bzrlib/config.py:3997
4815
msgid "Remove the option from the configuration file."
4816
msgstr ""
4817
4818
#: bzrlib/conflicts.py:50
4819
msgid "List files with conflicts."
4820
msgstr ""
4821
4822
#: bzrlib/conflicts.py:57
4823
msgid ""
4824
"Conflicts normally are listed as short, human-readable messages. If --text\n"
4825
"is supplied, the pathnames of files with text conflicts are listed,\n"
4826
"instead. (This is useful for editing all files with text conflicts.)"
4827
msgstr ""
4828
4829
#: bzrlib/conflicts.py:61
4830
msgid "Use bzr resolve when you have fixed a problem."
4831
msgstr ""
4832
4833
#: bzrlib/conflicts.py:66
4834
msgid "List paths of files with text conflicts."
4835
msgstr ""
4836
4837
#: bzrlib/conflicts.py:85
4838
msgid "Marks the conflict as resolved."
4839
msgstr ""
4840
4841
#: bzrlib/conflicts.py:88
4842
msgid "Resolve the conflict preserving the version in the working tree."
4843
msgstr ""
4844
4845
#: bzrlib/conflicts.py:91
4846
msgid "Resolve the conflict taking the merged version into account."
4847
msgstr ""
4848
4849
#: bzrlib/conflicts.py:98
4850
msgid "How to resolve the conflict."
4851
msgstr ""
4852
4853
#: bzrlib/conflicts.py:104
4854
msgid "Mark a conflict as resolved."
4855
msgstr ""
4856
4857
#: bzrlib/conflicts.py:111
4858
msgid ""
4859
"Once you have fixed a problem, use \"bzr resolve\" to automatically mark\n"
4860
"text conflicts as fixed, \"bzr resolve FILE\" to mark a specific conflict "
4861
"as\n"
4862
"resolved, or \"bzr resolve --all\" to mark all conflicts as resolved."
4863
msgstr ""
4864
4865
#: bzrlib/conflicts.py:119
4866
msgid "Resolve all conflicts in this tree."
4867
msgstr ""
4868
4869
#: bzrlib/conflicts.py:126
4870
msgid "If --all is specified, no FILE may be provided"
4871
msgstr ""
4872
4873
#: bzrlib/conflicts.py:151
4874
#, python-format
4875
msgid "%d conflict auto-resolved."
4876
msgid_plural "%d conflicts auto-resolved."
4877
msgstr[0] ""
4878
msgstr[1] ""
4879
4880
#: bzrlib/conflicts.py:154
4881
msgid "Remaining conflicts:"
4882
msgstr ""
4883
4884
#: bzrlib/conflicts.py:159
4885
msgid "All conflicts resolved."
4886
msgstr ""
4887
4888
#: bzrlib/conflicts.py:168
4889
msgid "{0} conflict resolved, {1} remaining"
4890
msgid_plural "{0} conflicts resolved, {1} remaining"
4891
msgstr[0] ""
4892
msgstr[1] ""
4893
4894
#: bzrlib/controldir.py:698
4895
msgid "{0} is{1} redirected to {2}"
4896
msgstr ""
4897
4898
#: bzrlib/diff.py:399
4899
#, python-format
4900
msgid "*** Ignoring files outside view. View is %s"
4901
msgstr ""
4902
4903
#: bzrlib/errors.py:157
4904
msgid "The tree builder is already building a tree."
4905
msgstr ""
4906
4907
#: bzrlib/errors.py:178
4908
msgid "The dirstate file (%(state)s) appears to be corrupt: %(msg)s"
4909
msgstr ""
4910
4911
#: bzrlib/errors.py:197
4912
msgid ""
4913
"The API for \"%(api)s\" is not compatible with \"%(wanted)s\". It supports "
4914
"versions \"%(minimum)s\" to \"%(current)s\"."
4915
msgstr ""
4916
4917
#: bzrlib/errors.py:209
4918
msgid "The transport '%(transport)s' is only accessible within this process."
4919
msgstr ""
4920
4921
#: bzrlib/errors.py:227
4922
msgid "Invalid revision number %(revno)s"
4923
msgstr ""
4924
4925
#: bzrlib/errors.py:236
4926
msgid "Invalid revision-id {%(revision_id)s} in %(branch)s"
4927
msgstr ""
4928
4929
#: bzrlib/errors.py:247
4930
msgid "Reserved revision-id {%(revision_id)s}"
4931
msgstr ""
4932
4933
#: bzrlib/errors.py:261
4934
msgid "There is no public branch set for \"%(branch_url)s\"."
4935
msgstr ""
4936
4937
#: bzrlib/errors.py:271
4938
msgid ""
4939
"No help could be found for '%(topic)s'. Please use 'bzr help topics' to "
4940
"obtain a list of topics."
4941
msgstr ""
4942
4943
#: bzrlib/errors.py:280
4944
msgid "The file id \"%(file_id)s\" is not present in the tree %(tree)s."
4945
msgstr ""
4946
4947
#: bzrlib/errors.py:290
4948
msgid ""
4949
"The file id \"%(file_id)s\" is not present in the repository %(repository)r"
4950
msgstr ""
4951
4952
#: bzrlib/errors.py:299
4953
msgid "The branch '%(branch)s' is not stacked."
4954
msgstr ""
4955
4956
#: bzrlib/errors.py:313
4957
msgid "No WorkingTree exists for \"%(base)s\"."
4958
msgstr ""
4959
4960
#: bzrlib/errors.py:322
4961
msgid "Not currently building a tree."
4962
msgstr ""
4963
4964
#: bzrlib/errors.py:327
4965
msgid "%(url)s is not a local path."
4966
msgstr ""
4967
4968
#: bzrlib/errors.py:355
4969
msgid "%(not_locked)r is not write locked but needs to be."
4970
msgstr ""
4971
4972
#: bzrlib/errors.py:363
4973
msgid "Error in command line options"
4974
msgstr ""
4975
4976
#: bzrlib/errors.py:368
4977
msgid "%(value)s is not an index of type %(_type)s."
4978
msgstr ""
4979
4980
#: bzrlib/errors.py:378
4981
msgid "Error in data for index %(value)s."
4982
msgstr ""
4983
4984
#: bzrlib/errors.py:387
4985
msgid "The key '%(key)s' is already in index '%(index)s'."
4986
msgstr ""
4987
4988
#: bzrlib/errors.py:397
4989
msgid "The key '%(key)s' is not a valid key."
4990
msgstr ""
4991
4992
#: bzrlib/errors.py:406
4993
msgid "Could not parse options for index %(value)s."
4994
msgstr ""
4995
4996
#: bzrlib/errors.py:415
4997
msgid "The value '%(value)s' is not a valid value."
4998
msgstr ""
4999
5000
#: bzrlib/errors.py:443
5001
msgid "Generic path error: %(path)r%(extra)s)"
5002
msgstr ""
5003
5004
#: bzrlib/errors.py:456
5005
msgid "No such file: %(path)r%(extra)s"
5006
msgstr ""
5007
5008
#: bzrlib/errors.py:461
5009
msgid "File exists: %(path)r%(extra)s"
5010
msgstr ""
5011
5012
#: bzrlib/errors.py:467
5013
msgid ""
5014
"Could not rename %(source)s => %(dest)s because both files exist. (Use --"
5015
"after to tell bzr about a rename that has already happened)%(extra)s"
5016
msgstr ""
5017
5018
#: bzrlib/errors.py:483
5019
msgid "\"%(path)s\" is not a directory %(extra)s"
5020
msgstr ""
5021
5022
#: bzrlib/errors.py:488
5023
msgid "\"%(path)s\" is not in the working directory %(extra)s"
5024
msgstr ""
5025
5026
#: bzrlib/errors.py:493
5027
msgid "Directory not empty: \"%(path)s\"%(extra)s"
5028
msgstr ""
5029
5030
#: bzrlib/errors.py:498
5031
msgid "Hard-linking \"%(path)s\" is not supported"
5032
msgstr ""
5033
5034
#: bzrlib/errors.py:513
5035
msgid "Device or resource busy: \"%(path)s\"%(extra)s"
5036
msgstr ""
5037
5038
#: bzrlib/errors.py:518
5039
msgid "Permission denied: \"%(path)s\"%(extra)s"
5040
msgstr ""
5041
5042
#: bzrlib/errors.py:523
5043
msgid "Invalid url supplied to transport: \"%(path)s\"%(extra)s"
5044
msgstr ""
5045
5046
#: bzrlib/errors.py:528
5047
msgid "Invalid URL join request: %(reason)s: %(base)r + %(join_args)r"
5048
msgstr ""
5049
5050
#: bzrlib/errors.py:539
5051
msgid "URLs differ by more than path: %(from_)r and %(to)r"
5052
msgstr ""
5053
5054
#: bzrlib/errors.py:561
5055
msgid "The %(type)s hook '%(hook)s' is unknown in this version of bzrlib."
5056
msgstr ""
5057
5058
#: bzrlib/errors.py:571
5059
msgid "Unsupported protocol for url \"%(path)s\"%(extra)s"
5060
msgstr ""
5061
5062
#: bzrlib/errors.py:579
5063
msgid ""
5064
"The branch '%(url)s'(%(format)s) is not a stackable format. You will need to "
5065
"upgrade the branch to permit branch stacking."
5066
msgstr ""
5067
5068
#: bzrlib/errors.py:590
5069
msgid "The branch '%(branch_url)s' cannot be stacked on '%(target_url)s'."
5070
msgstr ""
5071
5072
#: bzrlib/errors.py:600
5073
msgid ""
5074
"The repository '%(url)s'(%(format)s) is not a stackable format. You will "
5075
"need to upgrade the repository to permit branch stacking."
5076
msgstr ""
5077
5078
#: bzrlib/errors.py:611
5079
msgid "Error reading from %(path)r."
5080
msgstr ""
5081
5082
#: bzrlib/errors.py:630
5083
msgid "Path \"%(path)s\" is not a child of path \"%(base)s\"%(extra)s"
5084
msgstr ""
5085
5086
#: bzrlib/errors.py:646
5087
msgid "Path \"%(path)s\" is not unicode normalized"
5088
msgstr ""
5089
5090
#: bzrlib/errors.py:654
5091
msgid "Not a branch: \"%(path)s\"%(detail)s."
5092
msgstr ""
5093
5094
#: bzrlib/errors.py:696
5095
msgid "No submit branch available for branch \"%(path)s\""
5096
msgstr ""
5097
5098
#: bzrlib/errors.py:705
5099
msgid "Already a branch: \"%(path)s\"."
5100
msgstr ""
5101
5102
#: bzrlib/errors.py:711
5103
msgid ""
5104
"Directory contains a branch, but no working tree (use bzr checkout if you "
5105
"wish to build a working tree): \"%(path)s\""
5106
msgstr ""
5107
5108
#: bzrlib/errors.py:716
5109
msgid ""
5110
"\"%(function)s\" called on an AtomicFile after it was closed: \"%(path)s\""
5111
msgstr ""
5112
5113
#: bzrlib/errors.py:726
5114
msgid ""
5115
"Parent not accessible given base \"%(base)s\" and relative path \"%(path)s\""
5116
msgstr ""
5117
5118
#: bzrlib/errors.py:736
5119
msgid "No repository present: \"%(path)s\""
5120
msgstr ""
5121
5122
#: bzrlib/errors.py:743
5123
msgid ""
5124
"Unsupported branch format: %(format)s\n"
5125
"Please run 'bzr upgrade'"
5126
msgstr ""
5127
5128
#: bzrlib/errors.py:749
5129
msgid "Unknown %(kind)s format: %(format)r"
5130
msgstr ""
5131
5132
#: bzrlib/errors.py:758
5133
msgid "Format %(format)s is not compatible with .bzr version %(bzrdir)s."
5134
msgstr ""
5135
5136
#: bzrlib/errors.py:768
5137
msgid "Parse error on line %(lineno)d of %(format)s format: %(line)s"
5138
msgstr ""
5139
5140
#: bzrlib/errors.py:783
5141
msgid ""
5142
"%(target)s\n"
5143
"is not compatible with\n"
5144
"%(source)s\n"
5145
"%(details)s"
5146
msgstr ""
5147
5148
#: bzrlib/errors.py:799
5149
msgid "Revision is not compatible with %(repo_format)s"
5150
msgstr ""
5151
5152
#: bzrlib/errors.py:809
5153
msgid "%(context_info)s%(path)s is already versioned."
5154
msgstr ""
5155
5156
#: bzrlib/errors.py:830
5157
msgid "%(context_info)s%(path)s is not versioned."
5158
msgstr ""
5159
5160
#: bzrlib/errors.py:851
5161
msgid "Path(s) are not versioned: %(paths_as_string)s"
5162
msgstr ""
5163
5164
#: bzrlib/errors.py:862
5165
msgid "Path(s) do not exist: %(paths_as_string)s%(extra)s"
5166
msgstr ""
5167
5168
#: bzrlib/errors.py:881
5169
msgid "Cannot operate on \"%(filename)s\" of unsupported kind \"%(kind)s\""
5170
msgstr ""
5171
5172
#: bzrlib/errors.py:889
5173
msgid ""
5174
"Filename %(filename)r is not valid in your current filesystem encoding "
5175
"%(fs_encoding)s"
5176
msgstr ""
5177
5178
#: bzrlib/errors.py:900
5179
msgid "Cannot operate on \"%(filename)s\" because it is a control file"
5180
msgstr ""
5181
5182
#: bzrlib/errors.py:918
5183
msgid "The lock for '%(lock_description)s' is in use and cannot be broken."
5184
msgstr ""
5185
5186
#: bzrlib/errors.py:957
5187
msgid "Cannot lock %(lock)s: %(why)s"
5188
msgstr ""
5189
5190
#: bzrlib/errors.py:967
5191
msgid ""
5192
"A transaction related operation was attempted after the transaction finished."
5193
msgstr ""
5194
5195
#: bzrlib/errors.py:994
5196
msgid "Cannot lock: transport is read only: %(transport)s"
5197
msgstr ""
5198
5199
#: bzrlib/errors.py:1002
5200
msgid "Could not acquire lock \"%(lock)s\": %(msg)s"
5201
msgstr ""
5202
5203
#: bzrlib/errors.py:1013
5204
msgid ""
5205
"Lock was broken while still open: %(lock)s - check storage consistency!"
5206
msgstr ""
5207
5208
#: bzrlib/errors.py:1024
5209
msgid ""
5210
"Lock was released and re-acquired before being broken: %(lock)s: held by "
5211
"%(holder)r, wanted to break %(target)r"
5212
msgstr ""
5213
5214
#: bzrlib/errors.py:1036
5215
msgid ""
5216
"Lock is apparently held, but corrupted: %(corruption_info)s\n"
5217
"Use 'bzr break-lock' to clear it"
5218
msgstr ""
5219
5220
#: bzrlib/errors.py:1049
5221
msgid "Lock not held: %(lock)s"
5222
msgstr ""
5223
5224
#: bzrlib/errors.py:1078
5225
msgid "No changes to commit"
5226
msgstr ""
5227
5228
#: bzrlib/errors.py:1083
5229
msgid ""
5230
"Selected-file commit of merges is not supported yet: files %(files_str)s"
5231
msgstr ""
5232
5233
#: bzrlib/errors.py:1093
5234
msgid ""
5235
"Excluding paths during commit is not supported by repository at "
5236
"%(repository)r."
5237
msgstr ""
5238
5239
#: bzrlib/errors.py:1102
5240
msgid ""
5241
"The specified commit message contains characters unsupported by the current "
5242
"encoding."
5243
msgstr ""
5244
5245
#: bzrlib/errors.py:1108
5246
msgid "Upgrade URL cannot work with readonly URLs."
5247
msgstr ""
5248
5249
#: bzrlib/errors.py:1113
5250
msgid "The branch format %(format)s is already at the most recent format."
5251
msgstr ""
5252
5253
#: bzrlib/errors.py:1136
5254
msgid "Option --change does not accept revision ranges"
5255
msgstr ""
5256
5257
#: bzrlib/errors.py:1141
5258
msgid "No namespace registered for string: %(spec)r"
5259
msgstr ""
5260
5261
#: bzrlib/errors.py:1160
5262
msgid ""
5263
"Requested revision: '%(spec)s' does not exist in branch: "
5264
"%(branch_url)s%(extra)s"
5265
msgstr ""
5266
5267
#: bzrlib/errors.py:1174
5268
msgid ""
5269
"Operation denied because it would change the main history, which is not "
5270
"permitted by the append_revisions_only setting on branch \"%(location)s\"."
5271
msgstr ""
5272
5273
#: bzrlib/errors.py:1185
5274
msgid ""
5275
"These branches have diverged. Use the missing command to see how.\n"
5276
"Use the merge command to reconcile them."
5277
msgstr ""
5278
5279
#: bzrlib/errors.py:1205
5280
msgid ""
5281
"Branches have no common ancestor, and no merge base revision was specified."
5282
msgstr ""
5283
5284
#: bzrlib/errors.py:1211
5285
msgid ""
5286
"Selected merge cannot perform reverse cherrypicks. Try merge3 or diff3."
5287
msgstr ""
5288
5289
#: bzrlib/errors.py:1217
5290
msgid "Revisions have no common ancestor: %(revision_a)s %(revision_b)s"
5291
msgstr ""
5292
5293
#: bzrlib/errors.py:1226
5294
msgid ""
5295
"Revisions are not derived from the same root: %(revision_a)s %(revision_b)s."
5296
msgstr ""
5297
5298
#: bzrlib/errors.py:1235
5299
msgid "Revision %(rev_id)s is not an ancestor of %(not_ancestor_id)s"
5300
msgstr ""
5301
5302
#: bzrlib/errors.py:1244
5303
msgid "Branch %(branch)s has no commits."
5304
msgstr ""
5305
5306
#: bzrlib/errors.py:1262
5307
msgid ""
5308
"Bound branch %(branch)s is out of date with master branch "
5309
"%(master)s.%(extra_help)s"
5310
msgstr ""
5311
5312
#: bzrlib/errors.py:1274
5313
msgid ""
5314
"Cannot commit to branch %(branch)s. It is bound to %(master)s, which is "
5315
"bound to %(remote)s."
5316
msgstr ""
5317
5318
#: bzrlib/errors.py:1286
5319
msgid "Cannot pull --overwrite to a branch which is bound %(branch)s"
5320
msgstr ""
5321
5322
#: bzrlib/errors.py:1295
5323
msgid ""
5324
"Unable to connect to target of bound branch %(branch)s => %(target)s: "
5325
"%(error)s"
5326
msgstr ""
5327
5328
#: bzrlib/errors.py:1307
5329
msgid "Error in processing weave: %(msg)s"
5330
msgstr ""
5331
5332
#: bzrlib/errors.py:1316
5333
msgid "Revision {%(revision_id)s} already present in %(weave)s"
5334
msgstr ""
5335
5336
#: bzrlib/errors.py:1327
5337
msgid "Revision {%(revision_id)s} not present in %(weave)s"
5338
msgstr ""
5339
5340
#: bzrlib/errors.py:1337
5341
msgid "Weave invariant violated: %(what)s"
5342
msgstr ""
5343
5344
#: bzrlib/errors.py:1346
5345
msgid "Parents are mismatched between two revisions. %(msg)s"
5346
msgstr ""
5347
5348
#: bzrlib/errors.py:1368
5349
msgid ""
5350
"Weaves differ on text content. Revision: {%(revision_id)s}, %(weave_a)s, "
5351
"%(weave_b)s"
5352
msgstr ""
5353
5354
#: bzrlib/errors.py:1380
5355
msgid "Versioned file error"
5356
msgstr ""
5357
5358
#: bzrlib/errors.py:1385
5359
msgid "Revision {%(revision_id)s} not present in \"%(file_id)s\"."
5360
msgstr ""
5361
5362
#: bzrlib/errors.py:1395
5363
msgid "Revision {%(revision_id)s} already present in \"%(file_id)s\"."
5364
msgstr ""
5365
5366
#: bzrlib/errors.py:1405
5367
msgid "Text did not match its checksum: %(msg)s"
5368
msgstr ""
5369
5370
#: bzrlib/errors.py:1531
5371
msgid "Export format %(format)r not supported"
5372
msgstr ""
5373
5374
#: bzrlib/errors.py:1540
5375
msgid "Transport error: %(msg)s %(orig_error)s"
5376
msgstr ""
5377
5378
#: bzrlib/errors.py:1566
5379
msgid "Generic bzr smart protocol error: %(details)s"
5380
msgstr ""
5381
5382
#: bzrlib/errors.py:1574
5383
msgid "Received bad protocol version marker: %(marker)r"
5384
msgstr ""
5385
5386
#: bzrlib/errors.py:1606
5387
msgid "Transport operation not possible: %(msg)s %(orig_error)s"
5388
msgstr ""
5389
5390
#: bzrlib/errors.py:1611
5391
msgid "Connection error: %(msg)s %(orig_error)s"
5392
msgstr ""
5393
5394
#: bzrlib/errors.py:1616
5395
msgid "%(msg)s %(host)s%(port)s%(orig_error)s"
5396
msgstr ""
5397
5398
#: bzrlib/errors.py:1637
5399
msgid "Connection closed: %(msg)s %(orig_error)s"
5400
msgstr ""
5401
5402
#: bzrlib/errors.py:1642
5403
msgid "Connection Timeout: %(msg)s%(orig_error)s"
5404
msgstr ""
5405
5406
#: bzrlib/errors.py:1647
5407
msgid "Invalid range access in %(path)s at %(offset)s: %(msg)s"
5408
msgstr ""
5409
5410
#: bzrlib/errors.py:1657
5411
msgid "Invalid http response for %(path)s: %(msg)s%(orig_error)s"
5412
msgstr ""
5413
5414
#: bzrlib/errors.py:1672
5415
msgid "Invalid http range %(range)r for %(path)s: %(msg)s"
5416
msgstr ""
5417
5418
#: bzrlib/errors.py:1686
5419
msgid "HTTP MIME Boundary missing for %(path)s: %(msg)s"
5420
msgstr ""
5421
5422
#: bzrlib/errors.py:1694
5423
msgid "Invalid http Content-type \"%(ctype)s\" for %(path)s: %(msg)s"
5424
msgstr ""
5425
5426
#: bzrlib/errors.py:1703
5427
msgid "%(source)s is%(permanently)s redirected to %(target)s"
5428
msgstr ""
5429
5430
#: bzrlib/errors.py:1717
5431
msgid "Too many redirections"
5432
msgstr ""
5433
5434
#: bzrlib/errors.py:1722
5435
msgid "Working tree has conflicts."
5436
msgstr ""
5437
5438
#: bzrlib/errors.py:1726
5439
msgid "Config file %(filename)s is not UTF-8 encoded\n"
5440
msgstr ""
5441
5442
#: bzrlib/errors.py:1735
5443
msgid ""
5444
"Error(s) parsing config file %(filename)s:\n"
5445
"%(errors)s"
5446
msgstr ""
5447
5448
#: bzrlib/errors.py:1746
5449
msgid "Bad value \"%(value)s\" for option \"%(name)s\"."
5450
msgstr ""
5451
5452
#: bzrlib/errors.py:1754
5453
msgid "%(username)r does not seem to contain a reasonable email address"
5454
msgstr ""
5455
5456
#: bzrlib/errors.py:1763
5457
msgid "Failed to GPG sign data with command \"%(command_line)s\""
5458
msgstr ""
5459
5460
#: bzrlib/errors.py:1771
5461
msgid "Failed to verify GPG signature data with error \"%(error)s\""
5462
msgstr ""
5463
5464
#: bzrlib/errors.py:1779
5465
msgid "Unable to import library \"%(library)s\": %(error)s"
5466
msgstr ""
5467
5468
#: bzrlib/errors.py:1787
5469
msgid "python-gpgme is not installed, it is needed to verify signatures"
5470
msgstr ""
5471
5472
#: bzrlib/errors.py:1795
5473
msgid ""
5474
"The working tree for %(basedir)s has changed since the last commit, but "
5475
"weave merge requires that it be unchanged"
5476
msgstr ""
5477
5478
#: bzrlib/errors.py:1805
5479
msgid ""
5480
"Can't reprocess and show base, because reprocessing obscures the "
5481
"relationship of conflicting lines to the base"
5482
msgstr ""
5483
5484
#: bzrlib/errors.py:1811
5485
msgid "Cycle in graph %(graph)r"
5486
msgstr ""
5487
5488
#: bzrlib/errors.py:1839
5489
msgid "File %(filename)s is not conflicted."
5490
msgstr ""
5491
5492
#: bzrlib/errors.py:1861
5493
msgid "No bundle was found in \"%(filename)s\"."
5494
msgstr ""
5495
5496
#: bzrlib/errors.py:1870
5497
msgid "Unable to handle bundle version %(version)s: %(msg)s"
5498
msgstr ""
5499
5500
#: bzrlib/errors.py:1880
5501
msgid "Branch %(base)s is missing revision %(text_revision)s of %(file_id)s"
5502
msgstr ""
5503
5504
#: bzrlib/errors.py:1893
5505
msgid "File id {%(file_id)s} already exists in inventory as %(entry)s"
5506
msgstr ""
5507
5508
#: bzrlib/errors.py:1903
5509
msgid "Key %(key)s is already present in map"
5510
msgstr ""
5511
5512
#: bzrlib/errors.py:1908
5513
msgid "The prefix %(prefix)s is in the help search path twice."
5514
msgstr ""
5515
5516
#: bzrlib/errors.py:1918
5517
msgid ""
5518
"No final name for trans_id %(trans_id)r\n"
5519
"file-id: %(file_id)r\n"
5520
"root trans-id: %(root_trans_id)r\n"
5521
msgstr ""
5522
5523
#: bzrlib/errors.py:1950
5524
msgid "Attempt to reuse a transform that has already been applied."
5525
msgstr ""
5526
5527
#: bzrlib/errors.py:1955
5528
msgid "Moving the root directory is not supported at this time"
5529
msgstr ""
5530
5531
#: bzrlib/errors.py:1960
5532
msgid "Failed to rename %(from_path)s to %(to_path)s: %(why)s"
5533
msgstr ""
5534
5535
#: bzrlib/errors.py:1971
5536
msgid ""
5537
"Could not move %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s"
5538
msgstr ""
5539
5540
#: bzrlib/errors.py:2007
5541
msgid ""
5542
"Could not rename %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s"
5543
msgstr ""
5544
5545
#: bzrlib/errors.py:2037
5546
msgid "Unable to import paramiko (required for sftp support): %(error)s"
5547
msgstr ""
5548
5549
#: bzrlib/errors.py:2045
5550
msgid "Nothing to merge."
5551
msgstr ""
5552
5553
#: bzrlib/errors.py:2050
5554
msgid "Format %(format)s cannot be initialised by this version of bzr."
5555
msgstr ""
5556
5557
#: bzrlib/errors.py:2059
5558
msgid ""
5559
"Cannot convert from format %(from_format)s to format %(format)s. "
5560
"%(problem)s"
5561
msgstr ""
5562
5563
#: bzrlib/errors.py:2071
5564
msgid "Could not find an appropriate Differ for file \"%(path)s\""
5565
msgstr ""
5566
5567
#: bzrlib/errors.py:2079
5568
msgid "%(exe_name)s could not be found on this machine"
5569
msgstr ""
5570
5571
#: bzrlib/errors.py:2087
5572
msgid "Diff is not installed on this machine: %(msg)s"
5573
msgstr ""
5574
5575
#: bzrlib/errors.py:2095
5576
msgid "Diff3 is not installed on this machine."
5577
msgstr ""
5578
5579
#: bzrlib/errors.py:2101
5580
msgid "The content being inserted is already present."
5581
msgstr ""
5582
5583
#: bzrlib/errors.py:2106
5584
msgid ""
5585
"This tree contains left-over files from a failed operation.\n"
5586
" Please examine %(limbo_dir)s to see if it contains any files you wish "
5587
"to\n"
5588
" keep, and delete it when you are done."
5589
msgstr ""
5590
5591
#: bzrlib/errors.py:2117
5592
msgid ""
5593
"This tree contains left-over files from a failed operation.\n"
5594
" Please examine %(pending_deletion)s to see if it contains any files you\n"
5595
" wish to keep, and delete it when you are done."
5596
msgstr ""
5597
5598
#: bzrlib/errors.py:2127
5599
msgid ""
5600
"Unable to delete transform temporary directory %(limbo_dir)s.\n"
5601
" Please examine %(limbo_dir)s to see if it contains any files you wish "
5602
"to\n"
5603
" keep, and delete it when you are done."
5604
msgstr ""
5605
5606
#: bzrlib/errors.py:2138
5607
msgid ""
5608
"Unable to delete transform temporary directory %(pending_deletion)s. Please "
5609
"examine %(pending_deletion)s to see if it contains any files you wish to "
5610
"keep, and delete it when you are done."
5611
msgstr ""
5612
5613
#: bzrlib/errors.py:2148
5614
msgid "Working tree is out of date, please run 'bzr update'.%(more)s"
5615
msgstr ""
5616
5617
#: bzrlib/errors.py:2162
5618
msgid ""
5619
"Public branch \"%(public_location)s\" lacks revision \"%(revstring)s\"."
5620
msgstr ""
5621
5622
#: bzrlib/errors.py:2175
5623
msgid "Error in merge modified format"
5624
msgstr ""
5625
5626
#: bzrlib/errors.py:2180
5627
msgid "Format error in conflict listings"
5628
msgstr ""
5629
5630
#: bzrlib/errors.py:2184
5631
msgid ""
5632
"Inconsistency in dirstate file %(dirstate_path)s.\n"
5633
"Error: %(description)s"
5634
msgstr ""
5635
5636
#: bzrlib/errors.py:2195
5637
msgid ""
5638
"An error has been detected in the repository %(repo_path)s.\n"
5639
"Please run bzr reconcile on this repository."
5640
msgstr ""
5641
5642
#: bzrlib/errors.py:2206
5643
msgid ""
5644
"An inconsistent delta was supplied involving %(path)r, %(file_id)r\n"
5645
"reason: %(reason)s"
5646
msgstr ""
5647
5648
#: bzrlib/errors.py:2219
5649
msgid ""
5650
"An inconsistent delta was supplied: %(delta)r\n"
5651
"reason: %(reason)s"
5652
msgstr ""
5653
5654
#: bzrlib/errors.py:2231
5655
msgid "To use this feature you must upgrade your branch at %(path)s."
5656
msgstr ""
5657
5658
#: bzrlib/errors.py:2240
5659
msgid "To use this feature you must upgrade your repository at %(path)s."
5660
msgstr ""
5661
5662
#: bzrlib/errors.py:2245
5663
msgid ""
5664
"To use this feature you must upgrade your branch at %(path)s to a format "
5665
"which supports rich roots."
5666
msgstr ""
5667
5668
#: bzrlib/errors.py:2251
5669
msgid "Cannot perform local-only commits on unbound branches."
5670
msgstr ""
5671
5672
#: bzrlib/errors.py:2256
5673
msgid "The method %(mname)s is not supported on objects of type %(tname)s."
5674
msgstr ""
5675
5676
#: bzrlib/errors.py:2277
5677
msgid "Ghost tags not supported by format %(format)r."
5678
msgstr ""
5679
5680
#: bzrlib/errors.py:2285
5681
msgid "File is binary but should be text."
5682
msgstr ""
5683
5684
#: bzrlib/errors.py:2290
5685
msgid "The path %(path)s is not permitted on this platform"
5686
msgstr ""
5687
5688
#: bzrlib/errors.py:2299
5689
msgid ""
5690
"Testament did not match expected value.\n"
5691
" For revision_id {%(revision_id)s}, expected {%(expected)s}, measured\n"
5692
" {%(measured)s}"
5693
msgstr ""
5694
5695
#: bzrlib/errors.py:2311
5696
msgid "Not a bzr revision-bundle: %(text)r"
5697
msgstr ""
5698
5699
#: bzrlib/errors.py:2320
5700
msgid "Bad bzr revision-bundle: %(text)r"
5701
msgstr ""
5702
5703
#: bzrlib/errors.py:2329
5704
msgid "Malformed bzr revision-bundle header: %(text)r"
5705
msgstr ""
5706
5707
#: bzrlib/errors.py:2334
5708
msgid "Malformed patches in bzr revision-bundle: %(text)r"
5709
msgstr ""
5710
5711
#: bzrlib/errors.py:2339
5712
msgid "Malformed footer in bzr revision-bundle: %(text)r"
5713
msgstr ""
5714
5715
#: bzrlib/errors.py:2344
5716
msgid "End of line marker was not \\n in bzr revision-bundle"
5717
msgstr ""
5718
5719
#: bzrlib/errors.py:2354
5720
msgid "Bundle format %(bundle_format)s is incompatible with %(other)s"
5721
msgstr ""
5722
5723
#: bzrlib/errors.py:2364
5724
msgid "Root class for inventory serialization errors"
5725
msgstr ""
5726
5727
#: bzrlib/errors.py:2368
5728
msgid ""
5729
"The inventory was not in the expected format:\n"
5730
" %(msg)s"
5731
msgstr ""
5732
5733
#: bzrlib/errors.py:2377
5734
msgid "This operation requires rich root data storage"
5735
msgstr ""
5736
5737
#: bzrlib/errors.py:2390
5738
msgid "Unrecognised value for BZR_SSH environment variable: %(vendor)s"
5739
msgstr ""
5740
5741
#: bzrlib/errors.py:2399
5742
msgid ""
5743
"Don't know how to handle SSH connections. Please set BZR_SSH environment "
5744
"variable."
5745
msgstr ""
5746
5747
#: bzrlib/errors.py:2406
5748
msgid ""
5749
"Could not determine revno for {%(revision_id)s} because its ancestry shows a "
5750
"ghost at {%(ghost_revision_id)s}"
5751
msgstr ""
5752
5753
#: bzrlib/errors.py:2416
5754
msgid "Ghost revision {%(revision_id)s} cannot be used here."
5755
msgstr ""
5756
5757
#: bzrlib/errors.py:2467
5758
msgid ""
5759
"A merge directive must provide either a bundle or a public branch location."
5760
msgstr ""
5761
5762
#: bzrlib/errors.py:2474
5763
msgid "Bad merge directive payload %(start)r"
5764
msgstr ""
5765
5766
#: bzrlib/errors.py:2484
5767
msgid "Preview patch does not match requested changes."
5768
msgstr ""
5769
5770
#: bzrlib/errors.py:2490
5771
msgid "Patch_type was %(patch_type)s, but no patch was supplied."
5772
msgstr ""
5773
5774
#: bzrlib/errors.py:2500
5775
msgid ""
5776
"Your branch does not have all of the revisions required in order to merge "
5777
"this merge directive and the target location specified in the merge "
5778
"directive is not a branch: %(location)s."
5779
msgstr ""
5780
5781
#: bzrlib/errors.py:2512
5782
msgid "Unsupported entry kind %(kind)s"
5783
msgstr ""
5784
5785
#: bzrlib/errors.py:2520
5786
msgid "Can't subsume %(other_tree)s into %(tree)s. %(reason)s"
5787
msgstr ""
5788
5789
#: bzrlib/errors.py:2530
5790
msgid "Subsume target %(other_tree)s needs to be upgraded."
5791
msgstr ""
5792
5793
#: bzrlib/errors.py:2549
5794
msgid "No such tag: %(tag_name)s"
5795
msgstr ""
5796
5797
#: bzrlib/errors.py:2557
5798
msgid "Tags not supported by %(branch)s; you may be able to use bzr upgrade."
5799
msgstr ""
5800
5801
#: bzrlib/errors.py:2566
5802
msgid "Tag %(tag_name)s already exists."
5803
msgstr ""
5804
5805
#: bzrlib/errors.py:2574
5806
msgid ""
5807
"Did not understand bug identifier %(bug_id)s: %(reason)s. See \"bzr help "
5808
"bugs\" for more information on this feature."
5809
msgstr ""
5810
5811
#: bzrlib/errors.py:2584
5812
msgid ""
5813
"The URL for bug tracker \"%(abbreviation)s\" doesn't contain {id}: %(url)s"
5814
msgstr ""
5815
5816
#: bzrlib/errors.py:2594
5817
msgid ""
5818
"Cannot find registered bug tracker called %(abbreviation)s on %(branch)s"
5819
msgstr ""
5820
5821
#: bzrlib/errors.py:2604
5822
msgid "Invalid line in bugs property: '%(line)s'"
5823
msgstr ""
5824
5825
#: bzrlib/errors.py:2612
5826
msgid "Invalid bug status: '%(status)s'"
5827
msgstr ""
5828
5829
#: bzrlib/errors.py:2620
5830
msgid "Could not understand response from smart server: %(response_tuple)r"
5831
msgstr ""
5832
5833
#: bzrlib/errors.py:2659
5834
msgid "Server sent an unexpected error: %(error_tuple)r"
5835
msgstr ""
5836
5837
#: bzrlib/errors.py:2678
5838
msgid "Unrecognised container format: %(container_format)r"
5839
msgstr ""
5840
5841
#: bzrlib/errors.py:2686
5842
msgid "Unexpected end of container stream"
5843
msgstr ""
5844
5845
#: bzrlib/errors.py:2691
5846
msgid "Unknown record type: %(record_type)r"
5847
msgstr ""
5848
5849
#: bzrlib/errors.py:2699
5850
msgid "Invalid record: %(reason)s"
5851
msgstr ""
5852
5853
#: bzrlib/errors.py:2707
5854
msgid "Container has data after end marker: %(excess)r"
5855
msgstr ""
5856
5857
#: bzrlib/errors.py:2715
5858
msgid "Container has multiple records with the same name: %(name)s"
5859
msgstr ""
5860
5861
#: bzrlib/errors.py:2728
5862
msgid "Corrupt or incompatible data stream: %(reason)s"
5863
msgstr ""
5864
5865
#: bzrlib/errors.py:2736
5866
msgid "SMTP error: %(error)s"
5867
msgstr ""
5868
5869
#: bzrlib/errors.py:2744
5870
msgid "No message supplied."
5871
msgstr ""
5872
5873
#: bzrlib/errors.py:2749
5874
msgid "No mail-to address (--mail-to) or output (-o) specified."
5875
msgstr ""
5876
5877
#: bzrlib/errors.py:2754
5878
msgid "Unknown mail client: %(mail_client)s"
5879
msgstr ""
5880
5881
#: bzrlib/errors.py:2762
5882
msgid ""
5883
"Unable to find mail client with the following names: "
5884
"%(mail_command_list_string)s"
5885
msgstr ""
5886
5887
#: bzrlib/errors.py:2772
5888
msgid "SMTP connection to %(host)s refused"
5889
msgstr ""
5890
5891
#: bzrlib/errors.py:2781
5892
msgid "Please specify smtp_server. No server at default %(host)s."
5893
msgstr ""
5894
5895
#: bzrlib/errors.py:2795
5896
msgid ""
5897
"'%(display_url)s' is not in sync with %(target_url)s. See bzr help sync-for-"
5898
"reconfigure."
5899
msgstr ""
5900
5901
#: bzrlib/errors.py:2807
5902
msgid "'%(display_url)s' is already a branch."
5903
msgstr ""
5904
5905
#: bzrlib/errors.py:2812
5906
msgid "'%(display_url)s' is already a tree."
5907
msgstr ""
5908
5909
#: bzrlib/errors.py:2817
5910
msgid "'%(display_url)s' is already a checkout."
5911
msgstr ""
5912
5913
#: bzrlib/errors.py:2822
5914
msgid "'%(display_url)s' is already a lightweight checkout."
5915
msgstr ""
5916
5917
#: bzrlib/errors.py:2827
5918
msgid "'%(display_url)s' is already using a shared repository."
5919
msgstr ""
5920
5921
#: bzrlib/errors.py:2832
5922
msgid "'%(display_url)s' is already standalone."
5923
msgstr ""
5924
5925
#: bzrlib/errors.py:2837
5926
msgid "Shared repository '%(display_url)s' already creates working trees."
5927
msgstr ""
5928
5929
#: bzrlib/errors.py:2843
5930
msgid ""
5931
"Shared repository '%(display_url)s' already doesn't create working trees."
5932
msgstr ""
5933
5934
#: bzrlib/errors.py:2849
5935
msgid "Requested reconfiguration of '%(display_url)s' is not supported."
5936
msgstr ""
5937
5938
#: bzrlib/errors.py:2854
5939
msgid "No location could be found to bind to at %(display_url)s."
5940
msgstr ""
5941
5942
#: bzrlib/errors.py:2859
5943
msgid ""
5944
"Working tree \"%(display_url)s\" has uncommitted changes (See bzr "
5945
"status).%(more)s"
5946
msgstr ""
5947
5948
#: bzrlib/errors.py:2878
5949
msgid ""
5950
"Working tree \"%(display_url)s\" has shelved changes (See bzr shelve --"
5951
"list).%(more)s"
5952
msgstr ""
5953
5954
#: bzrlib/errors.py:2884
5955
msgid "Variable {%(name)s} is not available."
5956
msgstr ""
5957
5958
#: bzrlib/errors.py:2892
5959
msgid "No template specified."
5960
msgstr ""
5961
5962
#: bzrlib/errors.py:2897
5963
msgid "Unable to create symlink %(path_str)son this platform"
5964
msgstr ""
5965
5966
#: bzrlib/errors.py:2912
5967
msgid ""
5968
"Unsupported timezone format \"%(timezone)s\", options are \"utc\", "
5969
"\"original\", \"local\"."
5970
msgstr ""
5971
5972
#: bzrlib/errors.py:2946
5973
msgid ""
5974
"Unable to encode %(kind)s path %(path)r in user encoding %(user_encoding)s"
5975
msgstr ""
5976
5977
#: bzrlib/errors.py:2958
5978
msgid "The \"%(config_id)s\" configuration does not exist."
5979
msgstr ""
5980
5981
#: bzrlib/errors.py:2966
5982
msgid "The \"%(option_name)s\" configuration option does not exist."
5983
msgstr ""
5984
5985
#: bzrlib/errors.py:2974
5986
msgid "The alias \"%(alias_name)s\" does not exist."
5987
msgstr ""
5988
5989
#: bzrlib/errors.py:2988
5990
msgid "\"%(alias_name)s\" is not a valid location alias."
5991
msgstr ""
5992
5993
#: bzrlib/errors.py:2996
5994
msgid "No %(alias_name)s location assigned."
5995
msgstr ""
5996
5997
#: bzrlib/errors.py:3004
5998
msgid "Cannot bind address \"%(host)s:%(port)i\": %(orig_error)s."
5999
msgstr ""
6000
6001
#: bzrlib/errors.py:3014
6002
msgid "Unknown rules detected: %(unknowns_str)s."
6003
msgstr ""
6004
6005
#: bzrlib/errors.py:3025
6006
msgid "Tip change rejected: %(msg)s"
6007
msgstr ""
6008
6009
#: bzrlib/errors.py:3033
6010
msgid "Shelf corrupt."
6011
msgstr ""
6012
6013
#: bzrlib/errors.py:3038
6014
msgid "Corruption while decompressing repository file%(orig_error)s"
6015
msgstr ""
6016
6017
#: bzrlib/errors.py:3050
6018
msgid "No changes are shelved with id \"%(shelf_id)d\"."
6019
msgstr ""
6020
6021
#: bzrlib/errors.py:3058
6022
msgid "\"%(invalid_id)s\" is not a valid shelf id, try a number instead."
6023
msgstr ""
6024
6025
#: bzrlib/errors.py:3066
6026
msgid ""
6027
"An attempt to access a url outside the server jail was made: '%(url)s'."
6028
msgstr ""
6029
6030
#: bzrlib/errors.py:3074
6031
msgid "The user aborted the operation."
6032
msgstr ""
6033
6034
#: bzrlib/errors.py:3079
6035
msgid "Branching '%(url)s'(%(format)s) must create a working tree."
6036
msgstr ""
6037
6038
#: bzrlib/errors.py:3089
6039
msgid "No such view: %(view_name)s."
6040
msgstr ""
6041
6042
#: bzrlib/errors.py:3099
6043
msgid ""
6044
"Views are not supported by %(tree)s; use 'bzr upgrade' to change your tree "
6045
"to a later format."
6046
msgstr ""
6047
6048
#: bzrlib/errors.py:3108
6049
msgid ""
6050
"Specified file \"%(file_name)s\" is outside the current view: %(view_str)s"
6051
msgstr ""
6052
6053
#: bzrlib/errors.py:3175
6054
msgid "%(bzrdir)r does not support co-located branches."
6055
msgstr ""
6056
6057
#: bzrlib/errors.py:3181
6058
msgid ""
6059
"Unable to determine your name.\n"
6060
"Please, set your name with the 'whoami' command.\n"
6061
"E.g. bzr whoami \"Your Name <name@example.com>\""
6062
msgstr ""
6063
6064
#: bzrlib/errors.py:3190
6065
msgid "Invalid pattern(s) found. %(msg)s"
6066
msgstr ""
6067
6068
#: bzrlib/errors.py:3198
6069
msgid ""
6070
"Branch \"%(branch_url)s\" appears to be bound to itself. Please use `bzr "
6071
"unbind` to fix."
6072
msgstr ""
6073
6074
#: bzrlib/errors.py:3209
6075
msgid "Loop involving %(refs)r while expanding \"%(string)s\"."
6076
msgstr ""
6077
6078
#: bzrlib/errors.py:3218
6079
msgid "Option %(name)s is not defined while expanding \"%(string)s\"."
6080
msgstr ""
6081
6082
#: bzrlib/errors.py:3227
6083
msgid ""
6084
"No compatible object available for operations from %(source)r to %(target)r."
6085
msgstr ""
6086
6087
#: bzrlib/errors.py:3237
6088
msgid ""
6089
"VFS requests over the smart server are not allowed. Encountered: %(method)s, "
6090
"%(arguments)s."
6091
msgstr ""
6092
6093
#: bzrlib/errors.py:3247
6094
msgid ""
6095
"Kind change from %(from_kind)s to %(to_kind)s for %(path)s not supported by "
6096
"format %(format)r"
6097
msgstr ""
6098
6099
#: bzrlib/errors.py:3259
6100
msgid ""
6101
"Missing feature %(feature)s not provided by this version of Bazaar or any "
6102
"plugin."
6103
msgstr ""
6104
6105
#: bzrlib/errors.py:3272
6106
msgid "Binary files section encountered."
6107
msgstr ""
6108
6109
#: bzrlib/errors.py:3280
6110
msgid ""
6111
"Malformed patch header. %(desc)s\n"
6112
"%(line)r"
6113
msgstr ""
6114
6115
#: bzrlib/errors.py:3289
6116
msgid ""
6117
"Malformed hunk header. %(desc)s\n"
6118
"%(line)r"
6119
msgstr ""
6120
6121
#: bzrlib/errors.py:3298
6122
msgid ""
6123
"Malformed line. %(desc)s\n"
6124
"%(line)r"
6125
msgstr ""
6126
6127
#: bzrlib/errors.py:3308
6128
msgid ""
6129
"Text contents mismatch at line %(line_no)d. Original has \"%(orig_line)s\", "
6130
"but patch says it should be \"%(patch_line)s\""
6131
msgstr ""
6132
6133
#: bzrlib/errors.py:3319
6134
msgid "The feature %(feature)s has already been registered."
6135
msgstr ""
6136
6137
#: bzrlib/export_pot.py:252
6138
#, python-format
6139
msgid "Exporting messages from builtin command: %s"
6140
msgstr ""
6141
6142
#: bzrlib/export_pot.py:271
6143
msgid "Exporting messages from plugin command: {0} in {1}"
6144
msgstr ""
6145
6146
#: bzrlib/export_pot.py:292
6147
#, python-format
6148
msgid "Exporting message from error: %s"
6149
msgstr ""
6150
6151
#: bzrlib/fetch.py:98
6152
msgid "Finding revisions"
6153
msgstr ""
6154
6155
#: bzrlib/fetch.py:103
6156
msgid "Fetching revisions"
6157
msgstr ""
6158
6159
#: bzrlib/foreign.py:262
6160
msgid "Push into a different VCS without any custom bzr metadata."
6161
msgstr ""
6162
6163
#: bzrlib/foreign.py:264
6164
msgid ""
6165
"This will afterwards rebase the local branch on the remote\n"
6166
"branch unless the --no-rebase option is used, in which case \n"
6167
"the two branches will be out of sync after the push. "
6168
msgstr ""
6169
6170
#: bzrlib/foreign.py:277
6171
msgid "Do not rebase after push."
6172
msgstr ""
6173
6174
#: bzrlib/foreign.py:311
6175
#, python-format
6176
msgid "Using saved location: %s\n"
6177
msgstr ""
6178
6179
#: bzrlib/foreign.py:321
6180
msgid ""
6181
"{0!r} and {1!r} are in the same VCS, lossy push not necessary. Please use "
6182
"regular push."
6183
msgstr ""
6184
6185
#: bzrlib/gpg.py:119 bzrlib/gpg.py:460
6186
msgid "{0} commits with valid signatures"
6187
msgstr ""
6188
6189
#: bzrlib/gpg.py:123 bzrlib/gpg.py:465
6190
msgid "{0} commit with unknown key"
6191
msgid_plural "{0} commits with unknown keys"
6192
msgstr[0] ""
6193
msgstr[1] ""
6194
6195
#: bzrlib/gpg.py:129 bzrlib/gpg.py:472
6196
msgid "{0} commit not valid"
6197
msgid_plural "{0} commits not valid"
6198
msgstr[0] ""
6199
msgstr[1] ""
6200
6201
#: bzrlib/gpg.py:135 bzrlib/gpg.py:479
6202
msgid "{0} commit not signed"
6203
msgid_plural "{0} commits not signed"
6204
msgstr[0] ""
6205
msgstr[1] ""
6206
6207
#: bzrlib/gpg.py:141 bzrlib/gpg.py:486
6208
msgid "{0} commit with key now expired"
6209
msgid_plural "{0} commits with key now expired"
6210
msgstr[0] ""
6211
msgstr[1] ""
6212
6213
#: bzrlib/gpg.py:343
6214
msgid "No GnuPG key results for pattern: {0}"
6215
msgstr ""
6216
6217
#: bzrlib/gpg.py:386
6218
msgid "{0} signed {1} commit"
6219
msgid_plural "{0} signed {1} commits"
6220
msgstr[0] ""
6221
msgstr[1] ""
6222
6223
#: bzrlib/gpg.py:403 bzrlib/gpg.py:419
6224
msgid "{0} commit by author {1}"
6225
msgid_plural "{0} commits by author {1}"
6226
msgstr[0] ""
6227
msgstr[1] ""
6228
6229
#: bzrlib/gpg.py:433
6230
msgid "Unknown key {0} signed {1} commit"
6231
msgid_plural "Unknown key {0} signed {1} commits"
6232
msgstr[0] ""
6233
msgstr[1] ""
6234
6235
#: bzrlib/gpg.py:452
6236
msgid "{0} commit by author {1} with key {2} now expired"
6237
msgid_plural "{0} commits by author {1} with key {2} now expired"
6238
msgstr[0] ""
6239
msgstr[1] ""
6240
6241
#: bzrlib/groupcompress.py:1739
6242
#, python-format
6243
msgid "Insert claimed random_id=True, but then inserted %r two times"
6244
msgstr ""
6245
6246
#: bzrlib/hooks.py:331
6247
#, python-format
6248
msgid "Introduced in: %s"
6249
msgstr ""
6250
6251
#: bzrlib/hooks.py:334
6252
#, python-format
6253
msgid "Deprecated in: %s"
6254
msgstr ""
6255
6256
#: bzrlib/knit.py:1766 bzrlib/knit.py:1802
6257
msgid "Walking content"
6258
msgstr ""
6259
6260
#: bzrlib/knit.py:3330
6261
msgid "annotating"
6262
msgstr ""
6263
6264
#: bzrlib/lock.py:548
6265
msgid "{0!r} was {1} locked again"
6266
msgstr ""
6267
6268
#: bzrlib/lockdir.py:321
6269
#, python-format
6270
msgid "error removing pending lock: %s"
6271
msgstr ""
6272
6273
#: bzrlib/lockdir.py:616
6274
msgid "Unable to obtain"
6275
msgstr ""
6276
6277
#: bzrlib/lockdir.py:618
6278
msgid "Lock owner changed for"
6279
msgstr ""
6280
6281
#: bzrlib/lockdir.py:620
6282
msgid "{0} lock {1} {2}."
6283
msgstr ""
6284
6285
#: bzrlib/lockdir.py:627
6286
#, python-format
6287
msgid "Will continue to try until %s, unless you press Ctrl-C."
6288
msgstr ""
6289
6290
#: bzrlib/lockdir.py:629
6291
msgid "See \"bzr help break-lock\" for more."
6292
msgstr ""
6293
6294
#: bzrlib/lockdir.py:739
6295
#, python-format
6296
msgid ""
6297
"held by %(user)s on %(hostname)s (process #%(pid)s), acquired %(time_ago)s"
6298
msgstr ""
6299
6300
#: bzrlib/log.py:572
6301
msgid "--exclude-common-ancestry requires two different revisions"
6302
msgstr ""
6303
6304
#: bzrlib/log.py:574
6305
#, python-format
6306
msgid "invalid direction %r"
6307
msgstr ""
6308
6309
#: bzrlib/log.py:662
6310
msgid "Start revision not found in history of end revision."
6311
msgstr ""
6312
6313
#: bzrlib/log.py:1080 bzrlib/log.py:1138
6314
msgid "Logging revision 0 is invalid."
6315
msgstr ""
6316
6317
#: bzrlib/log.py:1082 bzrlib/log.py:1140
6318
msgid "Start revision must be older than the end revision."
6319
msgstr ""
6320
6321
#: bzrlib/log.py:1827
6322
#, python-format
6323
msgid "unknown log formatter: %r"
6324
msgstr ""
6325
6326
#: bzrlib/log.py:2123
6327
msgid "fixes bug"
6328
msgid_plural "fixes bugs"
6329
msgstr[0] ""
6330
msgstr[1] ""
6331
6332
#: bzrlib/merge.py:689
6333
msgid "All changes applied successfully."
6334
msgstr ""
6335
6336
#: bzrlib/merge.py:691
6337
#, python-format
6338
msgid "%d conflicts encountered."
6339
msgstr ""
6340
6341
#: bzrlib/merge.py:845 bzrlib/merge.py:1933
6342
msgid "Preparing file merge"
6343
msgstr ""
6344
6345
#: bzrlib/multiparent.py:426
6346
msgid "Importing revisions"
6347
msgstr ""
6348
6349
#: bzrlib/option.py:526
6350
msgid "Show help message."
6351
msgstr ""
6352
6353
#: bzrlib/option.py:528
6354
msgid "Only display errors and warnings."
6355
msgstr ""
6356
6357
#: bzrlib/option.py:531
6358
msgid "Show usage message and options."
6359
msgstr ""
6360
6361
#: bzrlib/option.py:533
6362
msgid "Display more information."
6363
msgstr ""
6364
6365
#: bzrlib/option.py:541
6366
msgid ""
6367
"Select changes introduced by the specified revision. See also \"help "
6368
"revisionspec\"."
6369
msgstr ""
6370
6371
#: bzrlib/option.py:543
6372
msgid "Branch to operate on, instead of working directory."
6373
msgstr ""
6374
6375
#: bzrlib/option.py:545
6376
msgid "Detailed log format."
6377
msgstr ""
6378
6379
#: bzrlib/option.py:545
6380
msgid "Format used by GNU ChangeLog files."
6381
msgstr ""
6382
6383
#: bzrlib/option.py:545
6384
msgid "Log format with one line per revision."
6385
msgstr ""
6386
6387
#: bzrlib/option.py:545
6388
msgid "Moderately short log format."
6389
msgstr ""
6390
6391
#: bzrlib/option.py:545
6392
msgid "Use specified log format."
6393
msgstr ""
6394
6395
#: bzrlib/option.py:547
6396
msgid "Log format"
6397
msgstr ""
6398
6399
#: bzrlib/option.py:549
6400
msgid "LCA-newness merge."
6401
msgstr ""
6402
6403
#: bzrlib/option.py:549
6404
msgid "Merge using external diff3."
6405
msgstr ""
6406
6407
#: bzrlib/option.py:549
6408
msgid "Native diff3-style merge."
6409
msgstr ""
6410
6411
#: bzrlib/option.py:549
6412
msgid "Select a particular merge algorithm."
6413
msgstr ""
6414
6415
#: bzrlib/option.py:549
6416
msgid "Weave-based merge."
6417
msgstr ""
6418
6419
#: bzrlib/option.py:551
6420
msgid "Merge algorithm"
6421
msgstr ""
6422
6423
#: bzrlib/option.py:554
6424
msgid "Message string."
6425
msgstr ""
6426
6427
#: bzrlib/option.py:556
6428
msgid "Use an ASCII NUL (\\0) separator rather than a newline."
6429
msgstr ""
6430
6431
#: bzrlib/option.py:558
6432
msgid "Ignore differences between branches and overwrite unconditionally."
6433
msgstr ""
6434
6435
#: bzrlib/option.py:560
6436
msgid "Remember the specified location as a default."
6437
msgstr ""
6438
6439
#: bzrlib/option.py:562
6440
msgid "Reprocess to reduce spurious conflicts."
6441
msgstr ""
6442
6443
#: bzrlib/option.py:566
6444
msgid "See \"help revisionspec\" for details."
6445
msgstr ""
6446
6447
#: bzrlib/option.py:568
6448
msgid "Show internal object ids."
6449
msgstr ""
6450
6451
#: bzrlib/option.py:571
6452
msgid "Display timezone as local, original, or utc."
6453
msgstr ""
6454
6455
#: bzrlib/osutils.py:100
6456
msgid "Parameter {0!r} encoding is unsupported by {1} application locale."
6457
msgstr ""
6458
6459
#: bzrlib/osutils.py:220
6460
msgid "lstat/stat of ({0!r}): {1!r}"
6461
msgstr ""
6462
6463
#: bzrlib/osutils.py:997 bzrlib/osutils.py:1008
6464
#, python-format
6465
msgid "sorry, %r not allowed in path"
6466
msgstr ""
6467
6468
#: bzrlib/osutils.py:1226
6469
#, python-format
6470
msgid "%r is too short to calculate a relative path"
6471
msgstr ""
6472
6473
#: bzrlib/plugin.py:143
6474
#, python-format
6475
msgid "\"%s\" is not a valid <plugin_name>@<plugin_path> description "
6476
msgstr ""
6477
6478
#: bzrlib/plugins/bash_completion/bashcomp.py:411
6479
msgid "Enable completions for the selected plugin (default: all plugins)"
6480
msgstr ""
6481
6482
#: bzrlib/plugins/bash_completion/bashcomp.py:412
6483
msgid "Generate a shell function for bash command line completion."
6484
msgstr ""
6485
6486
#: bzrlib/plugins/bash_completion/bashcomp.py:414
6487
msgid ""
6488
"This command generates a shell function which can be used by bash to\n"
6489
"automatically complete the currently typed command when the user presses\n"
6490
"the completion key (usually tab)."
6491
msgstr ""
6492
6493
#: bzrlib/plugins/bash_completion/bashcomp.py:418
6494
msgid ""
6495
"Commonly used like this:\n"
6496
" eval \"`bzr bash-completion`\""
6497
msgstr ""
6498
6499
#: bzrlib/plugins/bash_completion/bashcomp.py:424
6500
msgid "Name of the generated function (default: _bzr)"
6501
msgstr ""
6502
6503
#: bzrlib/plugins/bash_completion/bashcomp.py:426
6504
msgid "Generate only the shell function, don't enable it"
6505
msgstr ""
6506
6507
#: bzrlib/plugins/launchpad/__init__.py:81
6508
msgid "Register a branch with launchpad.net."
6509
msgstr ""
6510
6511
#: bzrlib/plugins/launchpad/__init__.py:83
6512
msgid ""
6513
"This command lists a bzr branch in the directory of branches on\n"
6514
"launchpad.net. Registration allows the branch to be associated with\n"
6515
"bugs or specifications."
6516
msgstr ""
6517
6518
#: bzrlib/plugins/launchpad/__init__.py:87
6519
msgid ""
6520
"Before using this command you must register the project to which the\n"
6521
"branch belongs, and create an account for yourself on launchpad.net."
6522
msgstr ""
6523
6524
#: bzrlib/plugins/launchpad/__init__.py:90
6525
msgid ""
6526
"arguments:\n"
6527
" public_url: The publicly visible url for the branch to register.\n"
6528
" This must be an http or https url (which Launchpad can read\n"
6529
" from to access the branch). Local file urls, SFTP urls, and\n"
6530
" bzr+ssh urls will not work.\n"
6531
" If no public_url is provided, bzr will use the configured\n"
6532
" public_url if there is one for the current branch, and\n"
6533
" otherwise error."
6534
msgstr ""
6535
6536
#: bzrlib/plugins/launchpad/__init__.py:99
6537
msgid ""
6538
"example:\n"
6539
" bzr register-branch http://foo.com/bzr/fooproject.mine \\\n"
6540
" --project fooproject"
6541
msgstr ""
6542
6543
#: bzrlib/plugins/launchpad/__init__.py:106
6544
msgid "Launchpad project short name to associate with the branch."
6545
msgstr ""
6546
6547
#: bzrlib/plugins/launchpad/__init__.py:113
6548
msgid ""
6549
"Short name for the branch; by default taken from the last component of the "
6550
"url."
6551
msgstr ""
6552
6553
#: bzrlib/plugins/launchpad/__init__.py:117
6554
msgid "One-sentence description of the branch."
6555
msgstr ""
6556
6557
#: bzrlib/plugins/launchpad/__init__.py:120
6558
msgid "Longer description of the purpose or contents of the branch."
6559
msgstr ""
6560
6561
#: bzrlib/plugins/launchpad/__init__.py:123
6562
msgid "Branch author's email address, if not yourself."
6563
msgstr ""
6564
6565
#: bzrlib/plugins/launchpad/__init__.py:126
6566
msgid "The bug this branch fixes."
6567
msgstr ""
6568
6569
#: bzrlib/plugins/launchpad/__init__.py:129
6570
msgid "Prepare the request but don't actually send it."
6571
msgstr ""
6572
6573
#: bzrlib/plugins/launchpad/__init__.py:151
6574
msgid ""
6575
"register-branch requires a public branch url - see bzr help register-branch."
6576
msgstr ""
6577
6578
#: bzrlib/plugins/launchpad/__init__.py:159
6579
msgid "--product is deprecated; please use --project."
6580
msgstr ""
6581
6582
#: bzrlib/plugins/launchpad/__init__.py:191
6583
msgid "Open a Launchpad branch page in your web browser."
6584
msgstr ""
6585
6586
#: bzrlib/plugins/launchpad/__init__.py:196
6587
msgid "Do not actually open the browser. Just say the URL we would use."
6588
msgstr ""
6589
6590
#: bzrlib/plugins/launchpad/__init__.py:231
6591
#, python-format
6592
msgid "Opening %s in web browser"
6593
msgstr ""
6594
6595
#: bzrlib/plugins/launchpad/__init__.py:241
6596
msgid "Show or set the Launchpad user ID."
6597
msgstr ""
6598
6599
#: bzrlib/plugins/launchpad/__init__.py:243
6600
msgid ""
6601
"When communicating with Launchpad, some commands need to know your\n"
6602
"Launchpad user ID. This command can be used to set or show the\n"
6603
"user ID that Bazaar will use for such communication."
6604
msgstr ""
6605
6606
#: bzrlib/plugins/launchpad/__init__.py:247
6607
msgid ""
6608
":Examples:\n"
6609
" Show the Launchpad ID of the current user::"
6610
msgstr ""
6611
6612
#: bzrlib/plugins/launchpad/__init__.py:250
6613
msgid " bzr launchpad-login"
6614
msgstr ""
6615
6616
#: bzrlib/plugins/launchpad/__init__.py:252
6617
msgid " Set the Launchpad ID of the current user to 'bob'::"
6618
msgstr ""
6619
6620
#: bzrlib/plugins/launchpad/__init__.py:254
6621
msgid " bzr launchpad-login bob"
6622
msgstr ""
6623
6624
#: bzrlib/plugins/launchpad/__init__.py:261
6625
msgid "Don't check that the user name is valid."
6626
msgstr ""
6627
6628
#: bzrlib/plugins/launchpad/__init__.py:276
6629
#: bzrlib/plugins/launchpad/__init__.py:287
6630
msgid "Launchpad user ID exists and has SSH keys.\n"
6631
msgstr ""
6632
6633
#: bzrlib/plugins/launchpad/__init__.py:279
6634
msgid "No Launchpad user ID configured.\n"
6635
msgstr ""
6636
6637
#: bzrlib/plugins/launchpad/__init__.py:290
6638
#, python-format
6639
msgid "Launchpad user ID set to '%s'.\n"
6640
msgstr ""
6641
6642
#: bzrlib/plugins/launchpad/__init__.py:298
6643
msgid "Ask Launchpad to mirror a branch now."
6644
msgstr ""
6645
6646
#: bzrlib/plugins/launchpad/__init__.py:318
6647
msgid "Propose merging a branch on Launchpad."
6648
msgstr ""
6649
6650
#: bzrlib/plugins/launchpad/__init__.py:320
6651
msgid ""
6652
"This will open your usual editor to provide the initial comment. When it\n"
6653
"has created the proposal, it will open it in your default web browser."
6654
msgstr ""
6655
6656
#: bzrlib/plugins/launchpad/__init__.py:323
6657
msgid ""
6658
"The branch will be proposed to merge into SUBMIT_BRANCH. If SUBMIT_BRANCH\n"
6659
"is not supplied, the remembered submit branch will be used. If no submit\n"
6660
"branch is remembered, the development focus will be used."
6661
msgstr ""
6662
6663
#: bzrlib/plugins/launchpad/__init__.py:327
6664
msgid ""
6665
"By default, the SUBMIT_BRANCH's review team will be requested to review\n"
6666
"the merge proposal. This can be overriden by specifying --review (-R).\n"
6667
"The parameter the launchpad account name of the desired reviewer. This\n"
6668
"may optionally be followed by '=' and the review type. For example:"
6669
msgstr ""
6670
6671
#: bzrlib/plugins/launchpad/__init__.py:332
6672
msgid " bzr lp-propose-merge --review jrandom --review review-team=qa"
6673
msgstr ""
6674
6675
#: bzrlib/plugins/launchpad/__init__.py:334
6676
msgid ""
6677
"This will propose a merge, request \"jrandom\" to perform a review of\n"
6678
"unspecified type, and request \"review-team\" to perform a \"qa\" review."
6679
msgstr ""
6680
6681
#: bzrlib/plugins/launchpad/__init__.py:339
6682
msgid "Propose the merge on staging."
6683
msgstr ""
6684
6685
#: bzrlib/plugins/launchpad/__init__.py:341
6686
msgid "Commit message."
6687
msgstr ""
6688
6689
#: bzrlib/plugins/launchpad/__init__.py:343
6690
msgid "Mark the proposal as approved immediately."
6691
msgstr ""
6692
6693
#: bzrlib/plugins/launchpad/__init__.py:345
6694
msgid "Requested reviewer and optional type."
6695
msgstr ""
6696
6697
#: bzrlib/plugins/launchpad/__init__.py:382
6698
msgid "Find the proposal to merge this revision."
6699
msgstr ""
6700
6701
#: bzrlib/plugins/launchpad/__init__.py:384
6702
msgid ""
6703
"Finds the merge proposal(s) that discussed landing the specified revision.\n"
6704
"This works only if the selected branch was the merge proposal target, and\n"
6705
"if the merged_revno is recorded for the merge proposal. The proposal(s)\n"
6706
"are opened in a web browser."
6707
msgstr ""
6708
6709
#: bzrlib/plugins/launchpad/__init__.py:389
6710
msgid ""
6711
"Any revision involved in the merge may be specified-- the revision in\n"
6712
"which the merge was performed, or one of the revisions that was merged."
6713
msgstr ""
6714
6715
#: bzrlib/plugins/launchpad/__init__.py:392
6716
msgid "So, to find the merge proposal that reviewed line 1 of README::"
6717
msgstr ""
6718
6719
#: bzrlib/plugins/launchpad/__init__.py:394
6720
msgid " bzr lp-find-proposal -r annotate:README:1"
6721
msgstr ""
6722
6723
#: bzrlib/plugins/launchpad/__init__.py:409
6724
msgid "No review found."
6725
msgstr ""
6726
6727
#: bzrlib/plugins/launchpad/__init__.py:410
6728
#, python-format
6729
msgid "%d proposals(s) found."
6730
msgstr ""
6731
6732
#: bzrlib/plugins/launchpad/__init__.py:420
6733
msgid "Finding revision-id"
6734
msgstr ""
6735
6736
#: bzrlib/plugins/launchpad/__init__.py:427
6737
msgid "Finding merge"
6738
msgstr ""
6739
6740
#: bzrlib/plugins/launchpad/__init__.py:432
6741
msgid "Finding revno"
6742
msgstr ""
6743
6744
#: bzrlib/plugins/launchpad/__init__.py:437
6745
msgid "Finding Launchpad branch"
6746
msgstr ""
6747
6748
#: bzrlib/plugins/launchpad/__init__.py:440
6749
msgid "Finding proposals"
6750
msgstr ""
6751
6752
#: bzrlib/plugins/launchpad/account.py:66
6753
msgid "Setting ssh/sftp usernames for launchpad.net."
6754
msgstr ""
6755
6756
#: bzrlib/plugins/launchpad/lp_api.py:241
6757
#: bzrlib/plugins/launchpad/lp_api.py:246
6758
#, python-format
6759
msgid "%s is not registered on Launchpad"
6760
msgstr ""
6761
6762
#: bzrlib/plugins/launchpad/lp_api.py:256
6763
#, python-format
6764
msgid "%s has no development focus."
6765
msgstr ""
6766
6767
#: bzrlib/plugins/launchpad/lp_api.py:261
6768
#, python-format
6769
msgid "development focus %s has no branch."
6770
msgstr ""
6771
6772
#: bzrlib/plugins/launchpad/lp_api.py:266
6773
#, python-format
6774
msgid "source package %s has no branch."
6775
msgstr ""
6776
6777
#: bzrlib/plugins/launchpad/lp_api.py:270
6778
#, python-format
6779
msgid "%s has no associated product or source package."
6780
msgstr ""
6781
6782
#: bzrlib/plugins/launchpad/lp_api.py:282
6783
#, python-format
6784
msgid "%s is already up-to-date."
6785
msgstr ""
6786
6787
#: bzrlib/plugins/launchpad/lp_api.py:289
6788
#, python-format
6789
msgid "Pushing to %s"
6790
msgstr ""
6791
6792
#: bzrlib/plugins/launchpad/lp_directory.py:170
6793
msgid ""
6794
"resolution for {0}\n"
6795
" local: {1}\n"
6796
" remote: {2}"
6797
msgstr ""
6798
6799
#: bzrlib/plugins/launchpad/lp_propose.py:149
6800
#, python-format
6801
msgid "There is already a branch merge proposal: %s"
6802
msgstr ""
6803
6804
#: bzrlib/plugins/weave_fmt/bzrdir.py:236
6805
msgid "pb parameter to convert() is deprecated"
6806
msgstr ""
6807
6808
#: bzrlib/plugins/weave_fmt/bzrdir.py:239
6809
msgid "starting upgrade from format 4 to 5"
6810
msgstr ""
6811
6812
#: bzrlib/plugins/weave_fmt/bzrdir.py:249
6813
msgid "note: upgrade may be faster if all store files are ungzipped first"
6814
msgstr ""
6815
6816
#: bzrlib/plugins/weave_fmt/bzrdir.py:278
6817
msgid "converting revision"
6818
msgstr ""
6819
6820
#: bzrlib/plugins/weave_fmt/bzrdir.py:283
6821
msgid "upgraded to weaves:"
6822
msgstr ""
6823
6824
#: bzrlib/plugins/weave_fmt/bzrdir.py:284
6825
#, python-format
6826
msgid "%6d revisions and inventories"
6827
msgstr ""
6828
6829
#: bzrlib/plugins/weave_fmt/bzrdir.py:286
6830
#, python-format
6831
msgid "%6d revisions not present"
6832
msgstr ""
6833
6834
#: bzrlib/plugins/weave_fmt/bzrdir.py:288
6835
#, python-format
6836
msgid "%6d texts"
6837
msgstr ""
6838
6839
#: bzrlib/plugins/weave_fmt/bzrdir.py:324
6840
msgid "writing weave"
6841
msgstr ""
6842
6843
#: bzrlib/plugins/weave_fmt/bzrdir.py:328
6844
#: bzrlib/plugins/weave_fmt/bzrdir.py:330
6845
msgid "inventory"
6846
msgstr ""
6847
6848
#: bzrlib/plugins/weave_fmt/bzrdir.py:347
6849
msgid "write revision"
6850
msgstr ""
6851
6852
#: bzrlib/plugins/weave_fmt/bzrdir.py:361
6853
msgid "loading revision"
6854
msgstr ""
6855
6856
#: bzrlib/plugins/weave_fmt/bzrdir.py:366
6857
#, python-format
6858
msgid "revision {%s} not present in branch; will be converted as a ghost"
6859
msgstr ""
6860
6861
#: bzrlib/plugins/weave_fmt/bzrdir.py:506
6862
msgid "starting upgrade from format 5 to 6"
6863
msgstr ""
6864
6865
#: bzrlib/plugins/weave_fmt/bzrdir.py:516
6866
#, python-format
6867
msgid "adding prefixes to %s"
6868
msgstr ""
6869
6870
#: bzrlib/plugins/weave_fmt/bzrdir.py:556
6871
msgid "starting upgrade from format 6 to metadir"
6872
msgstr ""
6873
6874
#: bzrlib/plugins/weave_fmt/bzrdir.py:564
6875
msgid "Removing ancestry.weave"
6876
msgstr ""
6877
6878
#: bzrlib/plugins/weave_fmt/bzrdir.py:569
6879
msgid "Finding branch files"
6880
msgstr ""
6881
6882
#: bzrlib/plugins/weave_fmt/bzrdir.py:579
6883
msgid "Upgrading repository"
6884
msgstr ""
6885
6886
#: bzrlib/plugins/weave_fmt/bzrdir.py:589
6887
msgid "Upgrading branch"
6888
msgstr ""
6889
6890
#: bzrlib/plugins/weave_fmt/bzrdir.py:612
6891
msgid "No working tree."
6892
msgstr ""
6893
6894
#: bzrlib/plugins/weave_fmt/bzrdir.py:619
6895
msgid "Upgrading working tree"
6896
msgstr ""
6897
6898
#: bzrlib/plugins/weave_fmt/bzrdir.py:640
6899
#, python-format
6900
msgid "Make %s lock"
6901
msgstr ""
6902
6903
#: bzrlib/plugins/weave_fmt/bzrdir.py:651
6904
#, python-format
6905
msgid "Moving %s"
6906
msgstr ""
6907
6908
#: bzrlib/push.py:56
6909
msgid "Created new branch."
6910
msgstr ""
6911
6912
#: bzrlib/push.py:98
6913
#, python-format
6914
msgid ""
6915
"Target directory %s already contains a .bzr directory, but it is not valid."
6916
msgstr ""
6917
6918
#: bzrlib/push.py:101
6919
#, python-format
6920
msgid ""
6921
"Target directory %s already exists, but does not have a .bzr directory. "
6922
"Supply --use-existing-dir to push there anyway."
6923
msgstr ""
6924
6925
#: bzrlib/push.py:122
6926
#, python-format
6927
msgid "Too many redirections trying to make %s."
6928
msgstr ""
6929
6930
#: bzrlib/push.py:147
6931
msgid ""
6932
"These branches have diverged. See \"bzr help diverged-branches\" for more "
6933
"information."
6934
msgstr ""
6935
6936
#: bzrlib/push.py:151
6937
#, python-format
6938
msgid ""
6939
"It is not possible to losslessly push to %s. You may want to use dpush "
6940
"instead."
6941
msgstr ""
6942
6943
#: bzrlib/push.py:157
6944
#, python-format
6945
msgid ""
6946
"At %s you have a valid .bzr control directory, but not a branch or "
6947
"repository. This is an unsupported configuration. Please move the target "
6948
"directory out of the way and try again."
6949
msgstr ""
6950
6951
#: bzrlib/reconcile.py:97
6952
#, python-format
6953
msgid "Reconciling branch %s"
6954
msgstr ""
6955
6956
#: bzrlib/reconcile.py:103
6957
#, python-format
6958
msgid "Reconciling repository %s"
6959
msgstr ""
6960
6961
#: bzrlib/reconcile.py:105
6962
msgid "Reconciling repository"
6963
msgstr ""
6964
6965
#: bzrlib/reconcile.py:111
6966
#, python-format
6967
msgid "%s cannot canonicalize CHKs."
6968
msgstr ""
6969
6970
#: bzrlib/reconcile.py:119
6971
msgid "Reconcile aborted: revision index has inconsistent parents."
6972
msgstr ""
6973
6974
#: bzrlib/reconcile.py:121
6975
msgid "Run \"bzr check\" for more details."
6976
msgstr ""
6977
6978
#: bzrlib/reconcile.py:123
6979
msgid "Reconciliation complete."
6980
msgstr ""
6981
6982
#: bzrlib/reconcile.py:166
6983
msgid "Fixing last revision info {0} => {1}"
6984
msgstr ""
6985
6986
#: bzrlib/reconcile.py:173
6987
msgid "revision_history ok."
6988
msgstr ""
6989
6990
#: bzrlib/reconcile.py:234
6991
msgid "Reading inventory data"
6992
msgstr ""
6993
6994
#: bzrlib/reconcile.py:254 bzrlib/reconcile.py:384
6995
msgid "Inventory ok."
6996
msgstr ""
6997
6998
#: bzrlib/reconcile.py:256 bzrlib/reconcile.py:386
6999
msgid "Backing up inventory"
7000
msgstr ""
7001
7002
#: bzrlib/reconcile.py:258
7003
msgid "Backup inventory created."
7004
msgstr ""
7005
7006
#: bzrlib/reconcile.py:274 bzrlib/reconcile.py:405
7007
msgid "Writing weave"
7008
msgstr ""
7009
7010
#: bzrlib/reconcile.py:277 bzrlib/reconcile.py:408
7011
msgid "Inventory regenerated."
7012
msgstr ""
7013
7014
#: bzrlib/reconcile.py:371 bzrlib/reconcile.py:373 bzrlib/reconcile.py:376
7015
msgid "Reading indexes"
7016
msgstr ""
7017
7018
#: bzrlib/reconcile.py:380 bzrlib/reconcile.py:382
7019
msgid "Checking unused inventories"
7020
msgstr ""
7021
7022
#: bzrlib/reconcile.py:388
7023
msgid "Backup Inventory created"
7024
msgstr ""
7025
7026
#: bzrlib/reconcile.py:446
7027
msgid "Fixing text parents"
7028
msgstr ""
7029
7030
#: bzrlib/reconfigure.py:54
7031
msgid "{0} is now stacked on {1}\n"
7032
msgstr ""
7033
7034
#: bzrlib/reconfigure.py:69
7035
#, python-format
7036
msgid "%s is now not stacked\n"
7037
msgstr ""
7038
7039
#: bzrlib/remote.py:1180 bzrlib/repository.py:289
7040
#, python-format
7041
msgid "bzr: ERROR (ignored): %s"
7042
msgstr ""
7043
7044
#: bzrlib/remote.py:2493
7045
msgid "Copying repository content as tarball..."
7046
msgstr ""
7047
7048
#: bzrlib/rename_map.py:69
7049
msgid "Calculating hashes"
7050
msgstr ""
7051
7052
#: bzrlib/rename_map.py:107
7053
msgid "Determining hash hits"
7054
msgstr ""
7055
7056
#: bzrlib/rename_map.py:242
7057
msgid "{0} => {1}"
7058
msgstr ""
7059
7060
#: bzrlib/repository.py:1787
7061
msgid "Moving repository to repository.backup"
7062
msgstr ""
7063
7064
#: bzrlib/repository.py:1794
7065
msgid "Creating new repository"
7066
msgstr ""
7067
7068
#: bzrlib/repository.py:1799
7069
msgid "Copying content"
7070
msgstr ""
7071
7072
#: bzrlib/repository.py:1803
7073
msgid "Deleting old repository content"
7074
msgstr ""
7075
7076
#: bzrlib/repository.py:1805
7077
msgid "repository converted"
7078
msgstr ""
7079
7080
#: bzrlib/revisionspec.py:903
7081
msgid "Using {0} {1}"
7082
msgstr ""
7083
7084
#: bzrlib/send.py:58
7085
#, python-format
7086
msgid "Mail client \"%s\" does not support specifying body"
7087
msgstr ""
7088
7089
#: bzrlib/send.py:62
7090
msgid "--remember requires a branch to be specified."
7091
msgstr ""
7092
7093
#: bzrlib/send.py:77
7094
msgid "No submit branch known or specified"
7095
msgstr ""
7096
7097
#: bzrlib/send.py:80
7098
msgid "Using saved {0} location \"{1}\" to determine what changes to submit."
7099
msgstr ""
7100
7101
#: bzrlib/send.py:98
7102
#, python-format
7103
msgid "No such send format '%s'."
7104
msgstr ""
7105
7106
#: bzrlib/send.py:114
7107
msgid "bzr send takes at most two one revision identifiers"
7108
msgstr ""
7109
7110
#: bzrlib/send.py:127
7111
msgid "No revisions to submit."
7112
msgstr ""
7113
7114
#: bzrlib/send.py:139
7115
msgid ""
7116
"- not supported for merge directives that use more than one output file."
7117
msgstr ""
7118
7119
#: bzrlib/send.py:185
7120
msgid "Format 0.9 does not permit bundle with no patch"
7121
msgstr ""
7122
7123
#: bzrlib/shelf_ui.py:46
7124
#, python-format
7125
msgid "Shelve adding file \"%(path)s\"?"
7126
msgstr ""
7127
7128
#: bzrlib/shelf_ui.py:47
7129
msgid "Shelve binary changes?"
7130
msgstr ""
7131
7132
#: bzrlib/shelf_ui.py:48
7133
msgid "Shelve changing \"%s\" from %(other)s to %(this)s?"
7134
msgstr ""
7135
7136
#: bzrlib/shelf_ui.py:50
7137
#, python-format
7138
msgid "Shelve removing file \"%(path)s\"?"
7139
msgstr ""
7140
7141
#: bzrlib/shelf_ui.py:51
7142
#, python-format
7143
msgid "Shelve %d change(s)?"
7144
msgstr ""
7145
7146
#: bzrlib/shelf_ui.py:52
7147
msgid "Shelve?"
7148
msgstr ""
7149
7150
#: bzrlib/shelf_ui.py:53
7151
#, python-format
7152
msgid ""
7153
"Shelve changing target of \"%(path)s\" from \"%(other)s\" to \"%(this)s\"?"
7154
msgstr ""
7155
7156
#: bzrlib/shelf_ui.py:55
7157
#, python-format
7158
msgid "Shelve renaming \"%(other)s\" => \"%(this)s\"?"
7159
msgstr ""
7160
7161
#: bzrlib/shelf_ui.py:70
7162
#, python-format
7163
msgid "Changes shelved with id \"%d\"."
7164
msgstr ""
7165
7166
#: bzrlib/shelf_ui.py:74
7167
msgid "Selected changes destroyed."
7168
msgstr ""
7169
7170
#: bzrlib/shelf_ui.py:78
7171
msgid "Selected changes:"
7172
msgstr ""
7173
7174
#: bzrlib/shelf_ui.py:98
7175
#, python-format
7176
msgid "Delete file \"%(path)s\"?"
7177
msgstr ""
7178
7179
#: bzrlib/shelf_ui.py:99
7180
msgid "Apply binary changes?"
7181
msgstr ""
7182
7183
#: bzrlib/shelf_ui.py:100
7184
#, python-format
7185
msgid "Change \"%(path)s\" from %(this)s to %(other)s?"
7186
msgstr ""
7187
7188
#: bzrlib/shelf_ui.py:102
7189
#, python-format
7190
msgid "Add file \"%(path)s\"?"
7191
msgstr ""
7192
7193
#: bzrlib/shelf_ui.py:103
7194
#, python-format
7195
msgid "Apply %d change(s)?"
7196
msgstr ""
7197
7198
#: bzrlib/shelf_ui.py:104
7199
msgid "Apply change?"
7200
msgstr ""
7201
7202
#: bzrlib/shelf_ui.py:105
7203
#, python-format
7204
msgid "Change target of \"%(path)s\" from \"%(this)s\" to \"%(other)s\"?"
7205
msgstr ""
7206
7207
#: bzrlib/shelf_ui.py:107
7208
#, python-format
7209
msgid "Rename \"%(this)s\" => \"%(other)s\"?"
7210
msgstr ""
7211
7212
#: bzrlib/shelf_ui.py:402
7213
msgid "No changes are shelved."
7214
msgstr ""
7215
7216
#: bzrlib/shelf_ui.py:460
7217
#, python-format
7218
msgid "Using changes with id \"%d\"."
7219
msgstr ""
7220
7221
#: bzrlib/shelf_ui.py:464
7222
#, python-format
7223
msgid "Message: %s"
7224
msgstr ""
7225
7226
#: bzrlib/shelf_ui.py:476
7227
#, python-format
7228
msgid "Deleted changes with id \"%d\"."
7229
msgstr ""
7230
7231
#: bzrlib/smart/medium.py:714
7232
msgid "HPSS calls: {0} ({1} vfs) {2}"
7233
msgstr ""
7234
7235
#: bzrlib/smart/server.py:169
7236
msgid "Requested to stop gracefully"
7237
msgstr ""
7238
7239
#: bzrlib/smart/server.py:179
7240
#, python-format
7241
msgid "Waiting for %d client(s) to finish"
7242
msgstr ""
7243
7244
#: bzrlib/smart/server.py:185
7245
#, python-format
7246
msgid "Still waiting for %d client(s) to finish"
7247
msgstr ""
7248
7249
#: bzrlib/smart/server.py:219
7250
#, python-format
7251
msgid "listening socket error: %s"
7252
msgstr ""
7253
7254
#: bzrlib/smart/server.py:452
7255
#, python-format
7256
msgid "listening on port: %s"
7257
msgstr ""
7258
7259
#: bzrlib/switch.py:69
7260
msgid "Pending merges must be committed or reverted before using switch."
7261
msgstr ""
7262
7263
#: bzrlib/switch.py:96
7264
msgid ""
7265
"Cannot switch as local commits found in the checkout. Commit these to the "
7266
"bound branch or use --force to throw them away."
7267
msgstr ""
7268
7269
#: bzrlib/switch.py:101
7270
#, python-format
7271
msgid ""
7272
"Unable to connect to current master branch %(target)s: %(error)s To switch "
7273
"anyway, use --force."
7274
msgstr ""
7275
7276
#: bzrlib/switch.py:110
7277
msgid "Cannot switch a branch, only a checkout."
7278
msgstr ""
7279
7280
#: bzrlib/switch.py:146
7281
#, python-format
7282
msgid "Tree is up to date at revision %d."
7283
msgstr ""
7284
7285
#: bzrlib/switch.py:152
7286
#, python-format
7287
msgid "Updated to revision %d."
7288
msgstr ""
7289
7290
#: bzrlib/transform.py:1730 bzrlib/transform.py:1741 bzrlib/transform.py:1743
7291
msgid "Apply phase"
7292
msgstr ""
7293
7294
#: bzrlib/transform.py:1769 bzrlib/transform.py:1837
7295
msgid "removing file"
7296
msgstr ""
7297
7298
#: bzrlib/transform.py:1787 bzrlib/transform.py:1872
7299
msgid "adding file"
7300
msgstr ""
7301
7302
#: bzrlib/transform.py:2587
7303
msgid "Building tree"
7304
msgstr ""
7305
7306
#: bzrlib/transform.py:2677 bzrlib/transform.py:2704
7307
msgid "Adding file contents"
7308
msgstr ""
7309
7310
#: bzrlib/transform.py:3024
7311
msgid "Resolution pass"
7312
msgstr ""
7313
7314
#: bzrlib/transport/ftp/_gssapi.py:88
7315
#, python-format
7316
msgid "Authenticated as %s"
7317
msgstr ""
7318
7319
#: bzrlib/tree.py:634
7320
msgid "*** {0} content-filter: {1} => {2!r}"
7321
msgstr ""
7322
7323
#: bzrlib/upgrade.py:77
7324
#, python-format
7325
msgid "This is a checkout. The branch (%s) needs to be upgraded separately."
7326
msgstr ""
7327
7328
#: bzrlib/upgrade.py:100
7329
#, python-format
7330
msgid "cannot upgrade from bzrdir format %s"
7331
msgstr ""
7332
7333
#: bzrlib/upgrade.py:103
7334
#, python-format
7335
msgid "starting upgrade of %s"
7336
msgstr ""
7337
7338
#: bzrlib/upgrade.py:110
7339
msgid "finished"
7340
msgstr ""
7341
7342
#: bzrlib/upgrade.py:120
7343
msgid "Deleting backup.bzr"
7344
msgstr ""
7345
7346
#: bzrlib/upgrade.py:151
7347
msgid ""
7348
"\n"
7349
"SUMMARY: {0} upgrades attempted, {1} succeeded, {2} failed"
7350
msgstr ""
7351
7352
#: bzrlib/upgrade.py:208
7353
#, python-format
7354
msgid "Found %d dependent branches - upgrading ..."
7355
msgstr ""
7356
7357
#: bzrlib/upgrade.py:276
7358
msgid "Upgrading bzrdirs"
7359
msgstr ""
7360
7361
#: bzrlib/upgrade.py:282
7362
#, python-format
7363
msgid "Upgrading %s"
7364
msgstr ""
7365
7366
#: bzrlib/upgrade.py:283
7367
msgid "Upgrading {0} {1} ..."
7368
msgstr ""
7369
7370
#: bzrlib/upgrade.py:301
7371
msgid "Removing backup ..."
7372
msgstr ""
7373
7374
#: bzrlib/upgrade.py:305
7375
msgid "failed to clean-up {0}: {1}"
7376
msgstr ""
7377
7378
#: bzrlib/vf_repository.py:1090
7379
msgid "inventories"
7380
msgstr ""
7381
7382
#: bzrlib/vf_repository.py:1116
7383
msgid "texts"
7384
msgstr ""
7385
7386
#: bzrlib/vf_repository.py:1621 bzrlib/vf_repository.py:1630
7387
msgid "Calculating text parents"
7388
msgstr ""
7389
7390
#: bzrlib/vf_repository.py:1706
7391
msgid "Fetch texts"
7392
msgstr ""
7393
7394
#: bzrlib/vf_repository.py:2535
7395
msgid "loading text store"
7396
msgstr ""
7397
7398
#: bzrlib/vf_repository.py:2541
7399
msgid "checking text graph"
7400
msgstr ""
7401
7402
#: bzrlib/vf_repository.py:2995 bzrlib/vf_repository.py:3009
7403
#: bzrlib/vf_repository.py:3124
7404
msgid "Transferring revisions"
7405
msgstr ""
7406
7407
#: bzrlib/win32utils.py:146
7408
msgid "Failed to GetProcessMemoryInfo()"
7409
msgstr ""
7410
7411
#: bzrlib/win32utils.py:167
7412
msgid "Cannot debug memory on win32 without ctypes or win32process"
7413
msgstr ""
7414
7415
#: bzrlib/win32utils.py:172
7416
msgid "WorkingSize {0:>7}KiB\tPeakWorking {1:>7}KiB\t{2}"
7417
msgstr ""
7418
7419
#: bzrlib/win32utils.py:180
7420
#, python-format
7421
msgid "WorkingSize %8d KiB"
7422
msgstr ""
7423
7424
#: bzrlib/win32utils.py:181
7425
#, python-format
7426
msgid "PeakWorking %8d KiB"
7427
msgstr ""
7428
7429
#: bzrlib/win32utils.py:182
7430
#, python-format
7431
msgid "PagefileUsage %8d KiB"
7432
msgstr ""
7433
7434
#: bzrlib/win32utils.py:183
7435
#, python-format
7436
msgid "PeakPagefileUsage %8d KiB"
7437
msgstr ""
7438
7439
#: bzrlib/win32utils.py:185
7440
#, python-format
7441
msgid "PrivateUsage %8d KiB"
7442
msgstr ""
7443
7444
#: bzrlib/win32utils.py:186
7445
#, python-format
7446
msgid "PageFaultCount %8d"
7447
msgstr ""
7448
7449
#: bzrlib/workingtree.py:1478
7450
msgid "Rerun update after fixing the conflicts."
7451
msgstr ""
7452
7453
#: dummy/help_topics/authentication/summary.txt:1
7454
msgid "Information on configuring authentication"
7455
msgstr ""
7456
7457
#: dummy/help_topics/basic/detail.txt:1
7458
msgid ""
7459
"Bazaar 2.5b5 -- a free distributed version-control tool\n"
7460
"http://bazaar.canonical.com/"
7461
msgstr ""
7462
7463
#: dummy/help_topics/basic/detail.txt:4
7464
msgid ""
7465
"Basic commands:\n"
7466
" bzr init makes this directory a versioned branch\n"
7467
" bzr branch make a copy of another branch"
7468
msgstr ""
7469
7470
#: dummy/help_topics/basic/detail.txt:8
7471
msgid ""
7472
" bzr add make files or directories versioned\n"
7473
" bzr ignore ignore a file or pattern\n"
7474
" bzr mv move or rename a versioned file"
7475
msgstr ""
7476
7477
#: dummy/help_topics/basic/detail.txt:12
7478
msgid ""
7479
" bzr status summarize changes in working copy\n"
7480
" bzr diff show detailed diffs"
7481
msgstr ""
7482
7483
#: dummy/help_topics/basic/detail.txt:15
7484
msgid ""
7485
" bzr merge pull in changes from another branch\n"
7486
" bzr commit save some or all changes\n"
7487
" bzr send send changes via email"
7488
msgstr ""
7489
7490
#: dummy/help_topics/basic/detail.txt:19
7491
msgid ""
7492
" bzr log show history of changes\n"
7493
" bzr check validate storage"
7494
msgstr ""
7495
7496
#: dummy/help_topics/basic/detail.txt:22
7497
msgid ""
7498
" bzr help init more help on e.g. init command\n"
7499
" bzr help commands list all commands\n"
7500
" bzr help topics list all help topics\n"
7501
msgstr ""
7502
7503
#: dummy/help_topics/basic/summary.txt:1
7504
msgid "Basic commands"
7505
msgstr ""
7506
7507
#: dummy/help_topics/branches/detail.txt:1
7508
msgid "Branches"
7509
msgstr ""
7510
7511
#: dummy/help_topics/branches/detail.txt:3
7512
msgid ""
7513
"A branch consists of the state of a project, including all of its\n"
7514
"history. All branches have a repository associated (which is where the\n"
7515
"branch history is stored), but multiple branches may share the same\n"
7516
"repository (a shared repository). Branches can be copied and merged."
7517
msgstr ""
7518
7519
#: dummy/help_topics/branches/detail.txt:8
7520
msgid ""
7521
"In addition, one branch may be bound to another one. Binding to another\n"
7522
"branch indicates that commits which happen in this branch must also \n"
7523
"happen in the other branch. Bazaar ensures consistency by not allowing \n"
7524
"commits when the two branches are out of date. In order for a commit \n"
7525
"to succeed, it may be necessary to update the current branch using \n"
7526
"``bzr update``."
7527
msgstr ""
7528
7529
#: dummy/help_topics/branches/detail.txt:15
7530
#: dummy/help_topics/checkouts/detail.txt:66
7531
#: dummy/help_topics/repositories/detail.txt:36
7532
msgid "Related commands::"
7533
msgstr ""
7534
7535
#: dummy/help_topics/branches/detail.txt:17
7536
msgid ""
7537
" init Change a directory into a versioned branch.\n"
7538
" branch Create a new branch that is a copy of an existing branch.\n"
7539
" merge Perform a three-way merge.\n"
7540
" bind Bind a branch to another one.\n"
7541
msgstr ""
7542
7543
#: dummy/help_topics/branches/summary.txt:1
7544
msgid "Information on what a branch is"
7545
msgstr ""
7546
7547
#: dummy/help_topics/bugs/summary.txt:1
7548
msgid "Bug tracker settings"
7549
msgstr ""
7550
7551
#: dummy/help_topics/checkouts/detail.txt:1
7552
msgid "Checkouts"
7553
msgstr ""
7554
7555
#: dummy/help_topics/checkouts/detail.txt:3
7556
msgid ""
7557
"Checkouts are source trees that are connected to a branch, so that when\n"
7558
"you commit in the source tree, the commit goes into that branch. They\n"
7559
"allow you to use a simpler, more centralized workflow, ignoring some of\n"
7560
"Bazaar's decentralized features until you want them. Using checkouts\n"
7561
"with shared repositories is very similar to working with SVN or CVS, but\n"
7562
"doesn't have the same restrictions. And using checkouts still allows\n"
7563
"others working on the project to use whatever workflow they like."
7564
msgstr ""
7565
7566
#: dummy/help_topics/checkouts/detail.txt:11
7567
msgid ""
7568
"A checkout is created with the bzr checkout command (see \"help "
7569
"checkout\").\n"
7570
"You pass it a reference to another branch, and it will create a local copy\n"
7571
"for you that still contains a reference to the branch you created the\n"
7572
"checkout from (the master branch). Then if you make any commits they will "
7573
"be\n"
7574
"made on the other branch first. This creates an instant mirror of your work, "
7575
"or\n"
7576
"facilitates lockstep development, where each developer is working together,\n"
7577
"continuously integrating the changes of others."
7578
msgstr ""
7579
7580
#: dummy/help_topics/checkouts/detail.txt:19
7581
msgid ""
7582
"However the checkout is still a first class branch in Bazaar terms, so that\n"
7583
"you have the full history locally. As you have a first class branch you "
7584
"can\n"
7585
"also commit locally if you want, for instance due to the temporary loss af "
7586
"a\n"
7587
"network connection. Use the --local option to commit to do this. All the "
7588
"local\n"
7589
"commits will then be made on the master branch the next time you do a non-"
7590
"local\n"
7591
"commit."
7592
msgstr ""
7593
7594
#: dummy/help_topics/checkouts/detail.txt:26
7595
msgid ""
7596
"If you are using a checkout from a shared branch you will periodically want "
7597
"to\n"
7598
"pull in all the changes made by others. This is done using the \"update\"\n"
7599
"command. The changes need to be applied before any non-local commit, but\n"
7600
"Bazaar will tell you if there are any changes and suggest that you use this\n"
7601
"command when needed."
7602
msgstr ""
7603
7604
#: dummy/help_topics/checkouts/detail.txt:32
7605
msgid ""
7606
"It is also possible to create a \"lightweight\" checkout by passing the\n"
7607
"--lightweight flag to checkout. A lightweight checkout is even closer to an\n"
7608
"SVN checkout in that it is not a first class branch, it mainly consists of "
7609
"the\n"
7610
"working tree. This means that any history operations must query the master\n"
7611
"branch, which could be slow if a network connection is involved. Also, as "
7612
"you\n"
7613
"don't have a local branch, then you cannot commit locally."
7614
msgstr ""
7615
7616
#: dummy/help_topics/checkouts/detail.txt:39
7617
msgid ""
7618
"Lightweight checkouts work best when you have fast reliable access to the\n"
7619
"master branch. This means that if the master branch is on the same disk or "
7620
"LAN\n"
7621
"a lightweight checkout will be faster than a heavyweight one for any "
7622
"commands\n"
7623
"that modify the revision history (as only one copy of the branch needs to\n"
7624
"be updated). Heavyweight checkouts will generally be faster for any command\n"
7625
"that uses the history but does not change it, but if the master branch is "
7626
"on\n"
7627
"the same disk then there won't be a noticeable difference."
7628
msgstr ""
7629
7630
#: dummy/help_topics/checkouts/detail.txt:47
7631
msgid ""
7632
"Another possible use for a checkout is to use it with a treeless repository\n"
7633
"containing your branches, where you maintain only one working tree by\n"
7634
"switching the master branch that the checkout points to when you want to\n"
7635
"work on a different branch."
7636
msgstr ""
7637
7638
#: dummy/help_topics/checkouts/detail.txt:52
7639
msgid ""
7640
"Obviously to commit on a checkout you need to be able to write to the "
7641
"master\n"
7642
"branch. This means that the master branch must be accessible over a "
7643
"writeable\n"
7644
"protocol , such as sftp://, and that you have write permissions at the "
7645
"other\n"
7646
"end. Checkouts also work on the local file system, so that all that matters "
7647
"is\n"
7648
"file permissions."
7649
msgstr ""
7650
7651
#: dummy/help_topics/checkouts/detail.txt:58
7652
msgid ""
7653
"You can change the master of a checkout by using the \"switch\" command "
7654
"(see\n"
7655
"\"help switch\"). This will change the location that the commits are sent "
7656
"to.\n"
7657
"The \"bind\" command can also be used to turn a normal branch into a heavy\n"
7658
"checkout. If you would like to convert your heavy checkout into a normal\n"
7659
"branch so that every commit is local, you can use the \"unbind\" command. To "
7660
"see\n"
7661
"whether or not a branch is bound or not you can use the \"info\" command. If "
7662
"the\n"
7663
"branch is bound it will tell you the location of the bound branch."
7664
msgstr ""
7665
7666
#: dummy/help_topics/checkouts/detail.txt:68
7667
msgid ""
7668
" checkout Create a checkout. Pass --lightweight to get a lightweight\n"
7669
" checkout\n"
7670
" update Pull any changes in the master branch in to your checkout\n"
7671
" commit Make a commit that is sent to the master branch. If you have\n"
7672
" a heavy checkout then the --local option will commit to the\n"
7673
" checkout without sending the commit to the master\n"
7674
" switch Change the master branch that the commits in the checkout "
7675
"will\n"
7676
" be sent to\n"
7677
" bind Turn a standalone branch into a heavy checkout so that any\n"
7678
" commits will be sent to the master branch\n"
7679
" unbind Turn a heavy checkout into a standalone branch so that any\n"
7680
" commits are only made locally\n"
7681
" info Displays whether a branch is bound or unbound. If the branch "
7682
"is\n"
7683
" bound, then it will also display the location of the bound "
7684
"branch\n"
7685
msgstr ""
7686
7687
#: dummy/help_topics/checkouts/summary.txt:1
7688
msgid "Information on what a checkout is"
7689
msgstr ""
7690
7691
#: dummy/help_topics/commands/summary.txt:1
7692
msgid "Basic help for all commands"
7693
msgstr ""
7694
7695
#: dummy/help_topics/configuration/summary.txt:1
7696
msgid "Details on the configuration settings available"
7697
msgstr ""
7698
7699
#: dummy/help_topics/conflict-types/summary.txt:1
7700
msgid "Types of conflicts and what to do about them"
7701
msgstr ""
7702
7703
#: dummy/help_topics/content-filters/summary.txt:1
7704
msgid "Conversion of content into/from working trees"
7705
msgstr ""
7706
7707
#: dummy/help_topics/criss-cross/detail.txt:1
7708
msgid "Criss-Cross"
7709
msgstr ""
7710
7711
#: dummy/help_topics/criss-cross/detail.txt:3
7712
msgid ""
7713
"A criss-cross in the branch history can cause the default merge technique\n"
7714
"to emit more conflicts than would normally be expected."
7715
msgstr ""
7716
7717
#: dummy/help_topics/criss-cross/detail.txt:6
7718
msgid ""
7719
"In complex merge cases, ``bzr merge --lca`` or ``bzr merge --weave`` may "
7720
"give\n"
7721
"better results. You may wish to ``bzr revert`` the working tree and merge\n"
7722
"again. Alternatively, use ``bzr remerge`` on particular conflicted files."
7723
msgstr ""
7724
7725
#: dummy/help_topics/criss-cross/detail.txt:10
7726
msgid ""
7727
"Criss-crosses occur in a branch's history if two branches merge the same "
7728
"thing\n"
7729
"and then merge one another, or if two branches merge one another at the "
7730
"same\n"
7731
"time. They can be avoided by having each branch only merge from or into a\n"
7732
"designated central branch (a \"star topology\")."
7733
msgstr ""
7734
7735
#: dummy/help_topics/criss-cross/detail.txt:15
7736
msgid ""
7737
"Criss-crosses cause problems because of the way merge works. Bazaar's "
7738
"default\n"
7739
"merge is a three-way merger; in order to merge OTHER into THIS, it must\n"
7740
"find a basis for comparison, BASE. Using BASE, it can determine whether\n"
7741
"differences between THIS and OTHER are due to one side adding lines, or\n"
7742
"from another side removing lines."
7743
msgstr ""
7744
7745
#: dummy/help_topics/criss-cross/detail.txt:21
7746
msgid ""
7747
"Criss-crosses mean there is no good choice for a base. Selecting the "
7748
"recent\n"
7749
"merge points could cause one side's changes to be silently discarded.\n"
7750
"Selecting older merge points (which Bazaar does) mean that extra conflicts\n"
7751
"are emitted."
7752
msgstr ""
7753
7754
#: dummy/help_topics/criss-cross/detail.txt:26
7755
msgid ""
7756
"The ``weave`` merge type is not affected by this problem because it uses\n"
7757
"line-origin detection instead of a basis revision to determine the cause of\n"
7758
"differences.\n"
7759
msgstr ""
7760
7761
#: dummy/help_topics/criss-cross/summary.txt:1
7762
msgid "Information on criss-cross merging"
7763
msgstr ""
7764
7765
#: dummy/help_topics/current-formats/summary.txt:1
7766
msgid "Current storage formats"
7767
msgstr ""
7768
7769
#: dummy/help_topics/debug-flags/summary.txt:1
7770
msgid "Options to show or record debug information"
7771
msgstr ""
7772
7773
#: dummy/help_topics/diverged-branches/summary.txt:1
7774
msgid "How to fix diverged branches"
7775
msgstr ""
7776
7777
#: dummy/help_topics/env-variables/detail.txt:1
7778
msgid "Environment Variables"
7779
msgstr ""
7780
7781
#: dummy/help_topics/env-variables/detail.txt:3
7782
msgid ""
7783
"=================== "
7784
"===========================================================\n"
7785
"BZRPATH Path where bzr is to look for shell plugin external\n"
7786
" commands.\n"
7787
"BZR_EMAIL E-Mail address of the user. Overrides EMAIL.\n"
7788
"EMAIL E-Mail address of the user.\n"
7789
"BZR_EDITOR Editor for editing commit messages. Overrides EDITOR.\n"
7790
"EDITOR Editor for editing commit messages.\n"
7791
"BZR_PLUGIN_PATH Paths where bzr should look for plugins.\n"
7792
"BZR_DISABLE_PLUGINS Plugins that bzr should not load.\n"
7793
"BZR_PLUGINS_AT Plugins to load from a directory not in "
7794
"BZR_PLUGIN_PATH.\n"
7795
"BZR_HOME Directory holding .bazaar config dir. Overrides HOME.\n"
7796
"BZR_HOME (Win32) Directory holding bazaar config dir. Overrides APPDATA "
7797
"and\n"
7798
" HOME.\n"
7799
"BZR_REMOTE_PATH Full name of remote 'bzr' command (for bzr+ssh:// "
7800
"URLs).\n"
7801
"BZR_SSH Path to SSH client, or one of paramiko, openssh, "
7802
"sshcorp,\n"
7803
" plink or lsh.\n"
7804
"BZR_LOG Location of .bzr.log (use '/dev/null' to suppress log).\n"
7805
"BZR_LOG (Win32) Location of .bzr.log (use 'NUL' to suppress log).\n"
7806
"BZR_COLUMNS Override implicit terminal width.\n"
7807
"BZR_CONCURRENCY Number of processes that can be run concurrently "
7808
"(selftest)\n"
7809
"BZR_PROGRESS_BAR Override the progress display. Values are 'none' or "
7810
"'text'.\n"
7811
"BZR_PDB Control whether to launch a debugger on error.\n"
7812
"BZR_SIGQUIT_PDB Control whether SIGQUIT behaves normally or invokes a\n"
7813
" breakin debugger.\n"
7814
"BZR_TEXTUI_INPUT Force console input mode for prompts to line-based "
7815
"(instead\n"
7816
" of char-based).\n"
7817
"=================== "
7818
"===========================================================\n"
7819
msgstr ""
7820
7821
#: dummy/help_topics/env-variables/summary.txt:1
7822
msgid "Environment variable names and values"
7823
msgstr ""
7824
7825
#: dummy/help_topics/eol/summary.txt:1
7826
msgid "Information on end-of-line handling"
7827
msgstr ""
7828
7829
#: dummy/help_topics/files/detail.txt:1
7830
msgid "Files"
7831
msgstr ""
7832
7833
#: dummy/help_topics/files/detail.txt:3
7834
msgid ""
7835
":On Unix: ~/.bazaar/bazaar.conf\n"
7836
":On Windows: C:\\\\Documents and Settings\\\\username\\\\Application Data\\\\"
7837
"bazaar\\\\2.0\\\\bazaar.conf"
7838
msgstr ""
7839
7840
#: dummy/help_topics/files/detail.txt:6
7841
msgid ""
7842
"Contains the user's default configuration. The section ``[DEFAULT]`` is\n"
7843
"used to define general configuration that will be applied everywhere.\n"
7844
"The section ``[ALIASES]`` can be used to create command aliases for\n"
7845
"commonly used options."
7846
msgstr ""
7847
7848
#: dummy/help_topics/files/detail.txt:11
7849
msgid "A typical config file might look something like::"
7850
msgstr ""
7851
7852
#: dummy/help_topics/files/detail.txt:13
7853
msgid ""
7854
" [DEFAULT]\n"
7855
" email=John Doe <jdoe@isp.com>"
7856
msgstr ""
7857
7858
#: dummy/help_topics/files/detail.txt:16
7859
msgid ""
7860
" [ALIASES]\n"
7861
" commit = commit --strict\n"
7862
" log10 = log --short -r -10..-1\n"
7863
msgstr ""
7864
7865
#: dummy/help_topics/files/summary.txt:1
7866
msgid "Information on configuration and log files"
7867
msgstr ""
7868
7869
#: dummy/help_topics/formats/detail.txt:1
7870
msgid "Storage Formats"
7871
msgstr ""
7872
7873
#: dummy/help_topics/formats/detail.txt:3
7874
msgid ""
7875
"To ensure that older clients do not access data incorrectly,\n"
7876
"Bazaar's policy is to introduce a new storage format whenever\n"
7877
"new features requiring new metadata are added. New storage\n"
7878
"formats may also be introduced to improve performance and\n"
7879
"scalability."
7880
msgstr ""
7881
7882
#: dummy/help_topics/formats/detail.txt:9
7883
msgid ""
7884
"The newest format, 2a, is highly recommended. If your\n"
7885
"project is not using 2a, then you should suggest to the\n"
7886
"project owner to upgrade."
7887
msgstr ""
7888
7889
#: dummy/help_topics/formats/detail.txt:13
7890
msgid ""
7891
"\n"
7892
".. note::"
7893
msgstr ""
7894
7895
#: dummy/help_topics/formats/detail.txt:16
7896
msgid ""
7897
" Some of the older formats have two variants:\n"
7898
" a plain one and a rich-root one. The latter include an additional\n"
7899
" field about the root of the tree. There is no performance cost\n"
7900
" for using a rich-root format but you cannot easily merge changes\n"
7901
" from a rich-root format into a plain format. As a consequence,\n"
7902
" moving a project to a rich-root format takes some co-ordination\n"
7903
" in that all contributors need to upgrade their repositories\n"
7904
" around the same time. 2a and all future formats will be\n"
7905
" implicitly rich-root."
7906
msgstr ""
7907
7908
#: dummy/help_topics/formats/detail.txt:26
7909
msgid ""
7910
"See :doc:`current-formats-help` for the complete list of\n"
7911
"currently supported formats. See :doc:`other-formats-help` for\n"
7912
"descriptions of any available experimental and deprecated formats.\n"
7913
msgstr ""
7914
7915
#: dummy/help_topics/formats/summary.txt:1
7916
msgid "Information on choosing a storage format"
7917
msgstr ""
7918
7919
#: dummy/help_topics/global-options/detail.txt:1
7920
msgid "Global Options"
7921
msgstr ""
7922
7923
#: dummy/help_topics/global-options/detail.txt:3
7924
msgid ""
7925
"These options may be used with any command, and may appear in front of any\n"
7926
"command. (e.g. ``bzr --profile help``)."
7927
msgstr ""
7928
7929
#: dummy/help_topics/global-options/detail.txt:6
7930
msgid ""
7931
"--version Print the version number. Must be supplied before the "
7932
"command.\n"
7933
"--no-aliases Do not process command aliases when running this command.\n"
7934
"--builtin Use the built-in version of a command, not the plugin "
7935
"version.\n"
7936
" This does not suppress other plugin effects.\n"
7937
"--no-plugins Do not process any plugins.\n"
7938
"--no-l10n Do not translate messages.\n"
7939
"--concurrency Number of processes that can be run concurrently (selftest)."
7940
msgstr ""
7941
7942
#: dummy/help_topics/global-options/detail.txt:14
7943
msgid ""
7944
"--profile Profile execution using the hotshot profiler.\n"
7945
"--lsprof Profile execution using the lsprof profiler.\n"
7946
"--lsprof-file Profile execution using the lsprof profiler, and write the\n"
7947
" results to a specified file. If the filename ends with "
7948
"\".txt\",\n"
7949
" text format will be used. If the filename either starts "
7950
"with\n"
7951
" \"callgrind.out\" or end with \".callgrind\", the output will "
7952
"be\n"
7953
" formatted for use with KCacheGrind. Otherwise, the output\n"
7954
" will be a pickle.\n"
7955
"--coverage Generate line coverage report in the specified directory."
7956
msgstr ""
7957
7958
#: dummy/help_topics/global-options/detail.txt:24
7959
msgid ""
7960
"-Oname=value Override the ``name`` config option setting it to ``value`` "
7961
"for\n"
7962
" the duration of the command. This can be used multiple times "
7963
"if\n"
7964
" several options need to be overridden."
7965
msgstr ""
7966
7967
#: dummy/help_topics/global-options/detail.txt:28
7968
msgid ""
7969
"See http://doc.bazaar.canonical.com/developers/profiling.html for more\n"
7970
"information on profiling."
7971
msgstr ""
7972
7973
#: dummy/help_topics/global-options/detail.txt:31
7974
msgid ""
7975
"A number of debug flags are also available to assist troubleshooting and\n"
7976
"development. See :doc:`debug-flags-help`.\n"
7977
msgstr ""
7978
7979
#: dummy/help_topics/global-options/summary.txt:1
7980
msgid "Options that control how Bazaar runs"
7981
msgstr ""
7982
7983
#: dummy/help_topics/hidden-commands/summary.txt:1
7984
msgid "All hidden commands"
7985
msgstr ""
7986
7987
#: dummy/help_topics/hooks/summary.txt:1
7988
msgid "Points at which custom processing can be added"
7989
msgstr ""
7990
7991
#: dummy/help_topics/launchpad/detail.txt:1
7992
msgid "Integration with Launchpad.net"
7993
msgstr ""
7994
7995
#: dummy/help_topics/launchpad/detail.txt:3
7996
msgid ""
7997
"Launchpad.net provides free Bazaar branch hosting with integrated bug and\n"
7998
"specification tracking."
7999
msgstr ""
8000
8001
#: dummy/help_topics/launchpad/detail.txt:6
8002
msgid ""
8003
"The bzr client (through the plugin called 'launchpad') has special\n"
8004
"features to communicate with Launchpad:"
8005
msgstr ""
8006
8007
#: dummy/help_topics/launchpad/detail.txt:9
8008
msgid ""
8009
" * The launchpad-login command tells Bazaar your Launchpad user name. "
8010
"This\n"
8011
" is then used by the 'lp:' transport to download your branches using\n"
8012
" bzr+ssh://."
8013
msgstr ""
8014
8015
#: dummy/help_topics/launchpad/detail.txt:13
8016
msgid ""
8017
" * The 'lp:' transport uses Launchpad as a directory service: for "
8018
"example\n"
8019
" 'lp:bzr' and 'lp:python' refer to the main branches of the relevant\n"
8020
" projects and may be branched, logged, etc. You can also use the 'lp:'\n"
8021
" transport to refer to specific branches, e.g. lp:~bzr/bzr/trunk."
8022
msgstr ""
8023
8024
#: dummy/help_topics/launchpad/detail.txt:18
8025
msgid ""
8026
" * The 'lp:' bug tracker alias can expand launchpad bug numbers to their\n"
8027
" URLs for use with 'bzr commit --fixes', e.g. 'bzr commit --fixes "
8028
"lp:12345'\n"
8029
" will record a revision property that marks that revision as fixing\n"
8030
" Launchpad bug 12345. When you push that branch to Launchpad it will\n"
8031
" automatically be linked to the bug report."
8032
msgstr ""
8033
8034
#: dummy/help_topics/launchpad/detail.txt:24
8035
msgid ""
8036
" * The register-branch command tells Launchpad about the url of a\n"
8037
" public branch. Launchpad will then mirror the branch, display\n"
8038
" its contents and allow it to be attached to bugs and other\n"
8039
" objects."
8040
msgstr ""
8041
8042
#: dummy/help_topics/launchpad/detail.txt:29
8043
msgid "For more information see http://help.launchpad.net/\n"
8044
msgstr ""
8045
8046
#: dummy/help_topics/launchpad/summary.txt:1
8047
msgid "Using Bazaar with Launchpad.net"
8048
msgstr ""
8049
8050
#: dummy/help_topics/location-alias/summary.txt:1
8051
msgid "Aliases for remembered locations"
8052
msgstr ""
8053
8054
#: dummy/help_topics/log-formats/summary.txt:1
8055
msgid "Details on the logging formats available"
8056
msgstr ""
8057
8058
#: dummy/help_topics/other-formats/summary.txt:1
8059
msgid "Experimental and deprecated storage formats"
8060
msgstr ""
8061
8062
#: dummy/help_topics/patterns/summary.txt:1
8063
msgid "Information on the pattern syntax"
8064
msgstr ""
8065
8066
#: dummy/help_topics/repositories/detail.txt:1
8067
msgid "Repositories"
8068
msgstr ""
8069
8070
#: dummy/help_topics/repositories/detail.txt:3
8071
msgid ""
8072
"Repositories in Bazaar are where committed information is stored. There is\n"
8073
"a repository associated with every branch."
8074
msgstr ""
8075
8076
#: dummy/help_topics/repositories/detail.txt:6
8077
msgid ""
8078
"Repositories are a form of database. Bzr will usually maintain this for\n"
8079
"good performance automatically, but in some situations (e.g. when doing\n"
8080
"very many commits in a short time period) you may want to ask bzr to\n"
8081
"optimise the database indices. This can be done by the 'bzr pack' command."
8082
msgstr ""
8083
8084
#: dummy/help_topics/repositories/detail.txt:11
8085
msgid ""
8086
"By default just running 'bzr init' will create a repository within the new\n"
8087
"branch but it is possible to create a shared repository which allows "
8088
"multiple\n"
8089
"branches to share their information in the same location. When a new branch "
8090
"is\n"
8091
"created it will first look to see if there is a containing shared repository "
8092
"it\n"
8093
"can use."
8094
msgstr ""
8095
8096
#: dummy/help_topics/repositories/detail.txt:17
8097
msgid ""
8098
"When two branches of the same project share a repository, there is\n"
8099
"generally a large space saving. For some operations (e.g. branching\n"
8100
"within the repository) this translates in to a large time saving."
8101
msgstr ""
8102
8103
#: dummy/help_topics/repositories/detail.txt:21
8104
msgid ""
8105
"To create a shared repository use the init-repository command (or the alias\n"
8106
"init-repo). This command takes the location of the repository to create. "
8107
"This\n"
8108
"means that 'bzr init-repository repo' will create a directory named 'repo',\n"
8109
"which contains a shared repository. Any new branches that are created in "
8110
"this\n"
8111
"directory will then use it for storage."
8112
msgstr ""
8113
8114
#: dummy/help_topics/repositories/detail.txt:27
8115
msgid ""
8116
"It is a good idea to create a repository whenever you might create more\n"
8117
"than one branch of a project. This is true for both working areas where you\n"
8118
"are doing the development, and any server areas that you use for hosting\n"
8119
"projects. In the latter case, it is common to want branches without working\n"
8120
"trees. Since the files in the branch will not be edited directly there is "
8121
"no\n"
8122
"need to use up disk space for a working tree. To create a repository in "
8123
"which\n"
8124
"the branches will not have working trees pass the '--no-trees' option to\n"
8125
"'init-repository'."
8126
msgstr ""
8127
8128
#: dummy/help_topics/repositories/detail.txt:38
8129
msgid ""
8130
" init-repository Create a shared repository. Use --no-trees to create "
8131
"one\n"
8132
" in which new branches won't get a working tree.\n"
8133
msgstr ""
8134
8135
#: dummy/help_topics/repositories/summary.txt:1
8136
msgid "Basic information on shared repositories."
8137
msgstr ""
8138
8139
#: dummy/help_topics/revisionspec/summary.txt:1
8140
msgid "Explain how to use --revision"
8141
msgstr ""
8142
8143
#: dummy/help_topics/rules/summary.txt:1
8144
msgid "Information on defining rule-based preferences"
8145
msgstr ""
8146
8147
#: dummy/help_topics/standalone-trees/detail.txt:1
8148
msgid "Standalone Trees"
8149
msgstr ""
8150
8151
#: dummy/help_topics/standalone-trees/detail.txt:3
8152
msgid ""
8153
"A standalone tree is a working tree with an associated repository. It\n"
8154
"is an independently usable branch, with no dependencies on any other.\n"
8155
"Creating a standalone tree (via bzr init) is the quickest way to put\n"
8156
"an existing project under version control."
8157
msgstr ""
8158
8159
#: dummy/help_topics/standalone-trees/detail.txt:8
8160
msgid "Related Commands::"
8161
msgstr ""
8162
8163
#: dummy/help_topics/standalone-trees/detail.txt:10
8164
msgid " init Make a directory into a versioned branch.\n"
8165
msgstr ""
8166
8167
#: dummy/help_topics/standalone-trees/summary.txt:1
8168
msgid "Information on what a standalone tree is"
8169
msgstr ""
8170
8171
#: dummy/help_topics/standard-options/detail.txt:1
8172
msgid "Standard Options"
8173
msgstr ""
8174
8175
#: dummy/help_topics/standard-options/detail.txt:3
8176
msgid "Standard options are legal for all commands."
8177
msgstr ""
8178
8179
#: dummy/help_topics/standard-options/detail.txt:5
8180
msgid ""
8181
"--help, -h Show help message.\n"
8182
"--verbose, -v Display more information.\n"
8183
"--quiet, -q Only display errors and warnings."
8184
msgstr ""
8185
8186
#: dummy/help_topics/standard-options/detail.txt:9
8187
msgid "Unlike global options, standard options can be used in aliases.\n"
8188
msgstr ""
8189
8190
#: dummy/help_topics/standard-options/summary.txt:1
8191
msgid "Options that can be used with any command"
8192
msgstr ""
8193
8194
#: dummy/help_topics/status-flags/detail.txt:1
8195
msgid "Status Flags"
8196
msgstr ""
8197
8198
#: dummy/help_topics/status-flags/detail.txt:3
8199
msgid ""
8200
"Status flags are used to summarise changes to the working tree in a concise\n"
8201
"manner. They are in the form::"
8202
msgstr ""
8203
8204
#: dummy/help_topics/status-flags/detail.txt:6
8205
msgid " xxx <filename>"
8206
msgstr ""
8207
8208
#: dummy/help_topics/status-flags/detail.txt:8
8209
msgid "where the columns' meanings are as follows."
8210
msgstr ""
8211
8212
#: dummy/help_topics/status-flags/detail.txt:10
8213
msgid "Column 1 - versioning/renames::"
8214
msgstr ""
8215
8216
#: dummy/help_topics/status-flags/detail.txt:12
8217
msgid ""
8218
" + File versioned\n"
8219
" - File unversioned\n"
8220
" R File renamed\n"
8221
" ? File unknown\n"
8222
" X File nonexistent (and unknown to bzr)\n"
8223
" C File has conflicts\n"
8224
" P Entry for a pending merge (not a file)"
8225
msgstr ""
8226
8227
#: dummy/help_topics/status-flags/detail.txt:20
8228
msgid "Column 2 - contents::"
8229
msgstr ""
8230
8231
#: dummy/help_topics/status-flags/detail.txt:22
8232
msgid ""
8233
" N File created\n"
8234
" D File deleted\n"
8235
" K File kind changed\n"
8236
" M File modified"
8237
msgstr ""
8238
8239
#: dummy/help_topics/status-flags/detail.txt:27
8240
msgid "Column 3 - execute::"
8241
msgstr ""
8242
8243
#: dummy/help_topics/status-flags/detail.txt:29
8244
msgid " * The execute bit was changed\n"
8245
msgstr ""
8246
8247
#: dummy/help_topics/status-flags/summary.txt:1
8248
msgid "Help on status flags"
8249
msgstr ""
8250
8251
#: dummy/help_topics/sync-for-reconfigure/detail.txt:1
8252
msgid "Branches Out of Sync"
8253
msgstr ""
8254
8255
#: dummy/help_topics/sync-for-reconfigure/detail.txt:3
8256
msgid ""
8257
"When reconfiguring a checkout, tree or branch into a lightweight checkout,\n"
8258
"a local branch must be destroyed. (For checkouts, this is the local branch\n"
8259
"that serves primarily as a cache.) If the branch-to-be-destroyed does not\n"
8260
"have the same last revision as the new reference branch for the lightweight\n"
8261
"checkout, data could be lost, so Bazaar refuses."
8262
msgstr ""
8263
8264
#: dummy/help_topics/sync-for-reconfigure/detail.txt:9
8265
msgid "How you deal with this depends on *why* the branches are out of sync."
8266
msgstr ""
8267
8268
#: dummy/help_topics/sync-for-reconfigure/detail.txt:11
8269
msgid ""
8270
"If you have a checkout and have done local commits, you can get back in "
8271
"sync\n"
8272
"by running \"bzr update\" (and possibly \"bzr commit\")."
8273
msgstr ""
8274
8275
#: dummy/help_topics/sync-for-reconfigure/detail.txt:14
8276
msgid ""
8277
"If you have a branch and the remote branch is out-of-date, you can push\n"
8278
"the local changes using \"bzr push\". If the local branch is out of date, "
8279
"you\n"
8280
"can do \"bzr pull\". If both branches have had changes, you can merge, "
8281
"commit\n"
8282
"and then push your changes. If you decide that some of the changes aren't\n"
8283
"useful, you can \"push --overwrite\" or \"pull --overwrite\" instead.\n"
8284
msgstr ""
8285
8286
#: dummy/help_topics/sync-for-reconfigure/summary.txt:1
8287
msgid "Steps to resolve \"out-of-sync\" when reconfiguring"
8288
msgstr ""
8289
8290
#: dummy/help_topics/topics/summary.txt:1
8291
msgid "Topics list"
8292
msgstr ""
8293
8294
#: dummy/help_topics/url-special-chars/summary.txt:1
8295
msgid "Special character handling in URLs"
8296
msgstr ""
8297
8298
#: dummy/help_topics/urlspec/summary.txt:1
8299
msgid "Supported transport protocols"
8300
msgstr ""
8301
8302
#: dummy/help_topics/working-trees/detail.txt:1
8303
msgid "Working Trees"
8304
msgstr ""
8305
8306
#: dummy/help_topics/working-trees/detail.txt:3
8307
msgid ""
8308
"A working tree is the contents of a branch placed on disk so that you can\n"
8309
"see the files and edit them. The working tree is where you make changes to "
8310
"a\n"
8311
"branch, and when you commit the current state of the working tree is the\n"
8312
"snapshot that is recorded in the commit."
8313
msgstr ""
8314
8315
#: dummy/help_topics/working-trees/detail.txt:8
8316
msgid ""
8317
"When you push a branch to a remote system, a working tree will not be\n"
8318
"created. If one is already present the files will not be updated. The\n"
8319
"branch information will be updated and the working tree will be marked\n"
8320
"as out-of-date. Updating a working tree remotely is difficult, as there\n"
8321
"may be uncommitted changes or the update may cause content conflicts that "
8322
"are\n"
8323
"difficult to deal with remotely."
8324
msgstr ""
8325
8326
#: dummy/help_topics/working-trees/detail.txt:15
8327
msgid ""
8328
"If you have a branch with no working tree you can use the 'checkout' "
8329
"command\n"
8330
"to create a working tree. If you run 'bzr checkout .' from the branch it "
8331
"will\n"
8332
"create the working tree. If the branch is updated remotely, you can update "
8333
"the\n"
8334
"working tree by running 'bzr update' in that directory."
8335
msgstr ""
8336
8337
#: dummy/help_topics/working-trees/detail.txt:20
8338
msgid ""
8339
"If you have a branch with a working tree that you do not want the 'remove-"
8340
"tree'\n"
8341
"command will remove the tree if it is safe. This can be done to avoid the\n"
8342
"warning about the remote working tree not being updated when pushing to the\n"
8343
"branch. It can also be useful when working with a '--no-trees' repository\n"
8344
"(see 'bzr help repositories')."
8345
msgstr ""
8346
8347
#: dummy/help_topics/working-trees/detail.txt:26
8348
msgid ""
8349
"If you want to have a working tree on a remote machine that you push to you\n"
8350
"can either run 'bzr update' in the remote branch after each push, or use "
8351
"some\n"
8352
"other method to update the tree during the push. There is an 'rspush' "
8353
"plugin\n"
8354
"that will update the working tree using rsync as well as doing a push. "
8355
"There\n"
8356
"is also a 'push-and-update' plugin that automates running 'bzr update' via "
8357
"SSH\n"
8358
"after each push."
8359
msgstr ""
8360
8361
#: dummy/help_topics/working-trees/detail.txt:33
8362
msgid "Useful commands::"
8363
msgstr ""
8364
8365
#: dummy/help_topics/working-trees/detail.txt:35
8366
msgid ""
8367
" checkout Create a working tree when a branch does not have one.\n"
8368
" remove-tree Removes the working tree from a branch when it is safe to do "
8369
"so.\n"
8370
" update When a working tree is out of sync with its associated "
8371
"branch\n"
8372
" this will update the tree to match the branch.\n"
8373
msgstr ""
8374
8375
#: dummy/help_topics/working-trees/summary.txt:1
8376
msgid "Information on working trees"
8377
msgstr ""
8378
8379
#: en/help_topics/authentication.txt:1
8380
msgid ""
8381
"Authentication Settings\n"
8382
"======================="
8383
msgstr ""
8384
8385
#: en/help_topics/authentication.txt:4
8386
msgid ""
8387
"\n"
8388
"Intent\n"
8389
"------"
8390
msgstr ""
8391
8392
#: en/help_topics/authentication.txt:8
8393
msgid ""
8394
"Many different authentication policies can be described in the\n"
8395
"``authentication.conf`` file but a particular user should need only a few\n"
8396
"definitions to cover his needs without having to specify a user and a "
8397
"password\n"
8398
"for every branch he uses."
8399
msgstr ""
8400
8401
#: en/help_topics/authentication.txt:13
8402
msgid ""
8403
"The definitions found in this file are used to find the credentials to use "
8404
"for\n"
8405
"a given url. The same credentials can generally be used for as many branches "
8406
"as\n"
8407
"possible by grouping their declaration around the remote servers that need\n"
8408
"them. It's even possible to declare credentials that will be used by "
8409
"different\n"
8410
"servers."
8411
msgstr ""
8412
8413
#: en/help_topics/authentication.txt:19
8414
msgid ""
8415
"The intent is to make this file as small as possible to minimize maintenance."
8416
msgstr ""
8417
8418
#: en/help_topics/authentication.txt:21
8419
msgid ""
8420
"Once the relevant credentials are declared in this file you may use branch "
8421
"urls\n"
8422
"without embedding passwords (security hazard) or even users (enabling "
8423
"sharing\n"
8424
"of your urls with others)."
8425
msgstr ""
8426
8427
#: en/help_topics/authentication.txt:25
8428
msgid "Instead of using::"
8429
msgstr ""
8430
8431
#: en/help_topics/authentication.txt:27
8432
msgid " bzr branch ftp://joe:secret@host.com/path/to/my/branch"
8433
msgstr ""
8434
8435
#: en/help_topics/authentication.txt:29
8436
msgid "you simply use::"
8437
msgstr ""
8438
8439
#: en/help_topics/authentication.txt:31
8440
msgid " bzr branch ftp://host.com/path/to/my/branch"
8441
msgstr ""
8442
8443
#: en/help_topics/authentication.txt:33
8444
msgid ""
8445
"provided you have created the following ``authentication.conf`` file::"
8446
msgstr ""
8447
8448
#: en/help_topics/authentication.txt:35
8449
msgid ""
8450
" [myprojects]\n"
8451
" scheme=ftp\n"
8452
" host=host.com\n"
8453
" user=joe\n"
8454
" password=secret\n"
8455
" "
8456
msgstr ""
8457
8458
#: en/help_topics/authentication.txt:42
8459
msgid ""
8460
"Authentication definitions\n"
8461
"--------------------------"
8462
msgstr ""
8463
8464
#: en/help_topics/authentication.txt:45
8465
msgid ""
8466
"There are two kinds of authentication used by the various schemes supported "
8467
"by\n"
8468
"bzr:"
8469
msgstr ""
8470
8471
#: en/help_topics/authentication.txt:48
8472
msgid "1. user and password"
8473
msgstr ""
8474
8475
#: en/help_topics/authentication.txt:50
8476
msgid ""
8477
"``FTP`` needs a (``user``, ``password``) to authenticate against a ``host``\n"
8478
"``SFTP`` can use either a password or a host key to authenticate. However,\n"
8479
"ssh agents are a better, more secure solution. So we have chosen to not "
8480
"provide\n"
8481
"our own less secure method."
8482
msgstr ""
8483
8484
#: en/help_topics/authentication.txt:55
8485
msgid "2. user, realm and password"
8486
msgstr ""
8487
8488
#: en/help_topics/authentication.txt:57
8489
msgid ""
8490
"``HTTP`` and ``HTTPS`` needs a (``user, realm, password``) to authenticate\n"
8491
"against a host. But, by using ``.htaccess`` files, for example, it is "
8492
"possible\n"
8493
"to define several (``user, realm, password``) for a given ``host``. So what "
8494
"is\n"
8495
"really needed is (``user``, ``password``, ``host``, ``path``). The ``realm`` "
8496
"is\n"
8497
"not taken into account in the definitions, but will displayed if bzr "
8498
"prompts\n"
8499
"you for a password."
8500
msgstr ""
8501
8502
#: en/help_topics/authentication.txt:64
8503
msgid ""
8504
"``HTTP proxy`` can be handled as ``HTTP`` (or ``HTTPS``) by explicitly\n"
8505
"specifying the appropriate port."
8506
msgstr ""
8507
8508
#: en/help_topics/authentication.txt:67
8509
msgid ""
8510
"To take all schemes into account, the password will be deduced from a set "
8511
"of\n"
8512
"authentication definitions (``scheme``, ``host``, ``port``, ``path``, "
8513
"``user``,\n"
8514
"``password``)."
8515
msgstr ""
8516
8517
#: en/help_topics/authentication.txt:71
8518
msgid ""
8519
" * ``scheme``: can be empty (meaning the rest of the definition can be "
8520
"used\n"
8521
" for any scheme), ``SFTP`` and ``bzr+ssh`` should not be used here, "
8522
"``ssh``\n"
8523
" should be used instead since this is the real scheme regarding\n"
8524
" authentication,"
8525
msgstr ""
8526
8527
#: en/help_topics/authentication.txt:76
8528
msgid " * ``host``: can be empty (to act as a default for any host),"
8529
msgstr ""
8530
8531
#: en/help_topics/authentication.txt:78
8532
msgid ""
8533
" * ``port`` can be empty (useful when an host provides several servers for "
8534
"the\n"
8535
" same scheme), only numerical values are allowed, this should be used "
8536
"only\n"
8537
" when the server uses a port different than the scheme standard port,"
8538
msgstr ""
8539
8540
#: en/help_topics/authentication.txt:82
8541
msgid " * ``path``: can be empty (FTP or SFTP will never user it),"
8542
msgstr ""
8543
8544
#: en/help_topics/authentication.txt:84
8545
msgid ""
8546
" * ``user``: can be empty (``bzr`` will defaults to python's\n"
8547
" ``getpass.get_user()``),"
8548
msgstr ""
8549
8550
#: en/help_topics/authentication.txt:87
8551
msgid ""
8552
" * ``password``: can be empty if you prefer to always be prompted for your\n"
8553
" password."
8554
msgstr ""
8555
8556
#: en/help_topics/authentication.txt:90
8557
msgid ""
8558
"Multiple definitions can be provided and, for a given URL, bzr will select "
8559
"a\n"
8560
"(``user`` [, ``password``]) based on the following rules :"
8561
msgstr ""
8562
8563
#: en/help_topics/authentication.txt:93
8564
msgid " 1. the first match wins,"
8565
msgstr ""
8566
8567
#: en/help_topics/authentication.txt:95
8568
msgid " 2. empty fields match everything,"
8569
msgstr ""
8570
8571
#: en/help_topics/authentication.txt:97
8572
msgid ""
8573
" 3. ``scheme`` matches even if decorators are used in the requested URL,"
8574
msgstr ""
8575
8576
#: en/help_topics/authentication.txt:99
8577
msgid ""
8578
" 4. ``host`` matches exactly or act as a domain if it starts with '.'\n"
8579
" (``project.bzr.sf.net`` will match ``.bzr.sf.net`` but "
8580
"``projectbzr.sf.net``\n"
8581
" will not match ``bzr.sf.net``)."
8582
msgstr ""
8583
8584
#: en/help_topics/authentication.txt:103
8585
msgid ""
8586
" 5. ``port`` matches if included in the requested URL (exact matches only)"
8587
msgstr ""
8588
8589
#: en/help_topics/authentication.txt:105
8590
msgid ""
8591
" 6. ``path`` matches if included in the requested URL (and by rule #2 "
8592
"above,\n"
8593
" empty paths will match any provided path)."
8594
msgstr ""
8595
8596
#: en/help_topics/authentication.txt:110
8597
msgid ""
8598
"File format\n"
8599
"-----------"
8600
msgstr ""
8601
8602
#: en/help_topics/authentication.txt:113
8603
msgid ""
8604
"The general rules for :doc:`configuration files <configuration-help>`\n"
8605
"apply except for the variable policies."
8606
msgstr ""
8607
8608
#: en/help_topics/authentication.txt:116
8609
msgid "Each section describes an authentication definition."
8610
msgstr ""
8611
8612
#: en/help_topics/authentication.txt:118
8613
msgid ""
8614
"The section name is an arbitrary string, only the ``DEFAULT`` value is "
8615
"reserved\n"
8616
"and should appear as the *last* section."
8617
msgstr ""
8618
8619
#: en/help_topics/authentication.txt:121
8620
msgid "Each section should define:"
8621
msgstr ""
8622
8623
#: en/help_topics/authentication.txt:123
8624
msgid "* ``user``: the login to be used,"
8625
msgstr ""
8626
8627
#: en/help_topics/authentication.txt:125
8628
msgid "Each section could define:"
8629
msgstr ""
8630
8631
#: en/help_topics/authentication.txt:127
8632
msgid "* ``host``: the remote server,"
8633
msgstr ""
8634
8635
#: en/help_topics/authentication.txt:129
8636
msgid "* ``port``: the port the server is listening,"
8637
msgstr ""
8638
8639
#: en/help_topics/authentication.txt:131
8640
msgid "* ``path``: the branch location,"
8641
msgstr ""
8642
8643
#: en/help_topics/authentication.txt:133
8644
msgid "* ``password``: the password."
8645
msgstr ""
8646
8647
#: en/help_topics/authentication.txt:135
8648
msgid ""
8649
"\n"
8650
"Examples\n"
8651
"--------"
8652
msgstr ""
8653
8654
#: en/help_topics/authentication.txt:139
8655
msgid ""
8656
"\n"
8657
"Personal projects hosted outside\n"
8658
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
8659
msgstr ""
8660
8661
#: en/help_topics/authentication.txt:143
8662
msgid ""
8663
"All connections are done with the same ``user`` (the remote one for which "
8664
"the\n"
8665
"default bzr one is not appropriate) and the password is always prompted "
8666
"with\n"
8667
"some exceptions::"
8668
msgstr ""
8669
8670
#: en/help_topics/authentication.txt:147
8671
msgid ""
8672
" # Pet projects on hobby.net\n"
8673
" [hobby]\n"
8674
" host=r.hobby.net\n"
8675
" user=jim\n"
8676
" password=obvious1234\n"
8677
" \n"
8678
" # Home server\n"
8679
" [home]\n"
8680
" scheme=https\n"
8681
" host=home.net\n"
8682
" user=joe\n"
8683
" password=1essobV10us\n"
8684
" \n"
8685
" [DEFAULT]\n"
8686
" # Our local user is barbaz, on all remote sites we're known as "
8687
"foobar\n"
8688
" user=foobar"
8689
msgstr ""
8690
8691
#: en/help_topics/authentication.txt:164
8692
msgid ""
8693
"\n"
8694
"Source hosting provider\n"
8695
"~~~~~~~~~~~~~~~~~~~~~~~"
8696
msgstr ""
8697
8698
#: en/help_topics/authentication.txt:168
8699
msgid "In the shp.net (fictitious) domain, each project has its own site::"
8700
msgstr ""
8701
8702
#: en/help_topics/authentication.txt:170
8703
msgid ""
8704
" [shpnet domain]\n"
8705
" # we use sftp, but ssh is the scheme used for authentication\n"
8706
" scheme=ssh\n"
8707
" # The leading '.' ensures that 'shp.net' alone doesn't match\n"
8708
" host=.shp.net\n"
8709
" user=joe\n"
8710
" # bzr don't support supplying a password for sftp,\n"
8711
" # consider using an ssh agent if you don't want to supply\n"
8712
" # a password interactively. (pageant, ssh-agent, etc)"
8713
msgstr ""
8714
8715
#: en/help_topics/authentication.txt:180
8716
msgid ""
8717
"HTTPS, SFTP servers and their proxy\n"
8718
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
8719
msgstr ""
8720
8721
#: en/help_topics/authentication.txt:183
8722
msgid ""
8723
"At company.com, the server hosting release and integration branches is "
8724
"behind a\n"
8725
"proxy, and the two branches use different authentication policies::"
8726
msgstr ""
8727
8728
#: en/help_topics/authentication.txt:186
8729
msgid ""
8730
" [reference code]\n"
8731
" scheme=https\n"
8732
" host=dev.company.com\n"
8733
" path=/dev\n"
8734
" user=user1\n"
8735
" password=pass1"
8736
msgstr ""
8737
8738
#: en/help_topics/authentication.txt:193
8739
msgid ""
8740
" # development branches on dev server\n"
8741
" [dev]\n"
8742
" scheme=ssh # bzr+ssh and sftp are available here\n"
8743
" host=dev.company.com\n"
8744
" path=/dev/integration\n"
8745
" user=user2\n"
8746
" \n"
8747
" # proxy\n"
8748
" [proxy]\n"
8749
" scheme=http\n"
8750
" host=proxy.company.com\n"
8751
" port=3128\n"
8752
" user=proxyuser1\n"
8753
" password=proxypass1"
8754
msgstr ""
8755
8756
#: en/help_topics/authentication.txt:208
8757
msgid ""
8758
"\n"
8759
"Planned enhancements\n"
8760
"--------------------"
8761
msgstr ""
8762
8763
#: en/help_topics/authentication.txt:212
8764
msgid ""
8765
"The following are not yet implemented but planned as parts of a work in\n"
8766
"progress:"
8767
msgstr ""
8768
8769
#: en/help_topics/authentication.txt:215
8770
msgid "* add a ``password_encoding`` field allowing:"
8771
msgstr ""
8772
8773
#: en/help_topics/authentication.txt:217
8774
msgid ""
8775
" - storing the passwords in various obfuscating encodings (base64 for one),"
8776
msgstr ""
8777
8778
#: en/help_topics/authentication.txt:219
8779
msgid " - delegate password storage to plugins (.netrc for example)."
8780
msgstr ""
8781
8782
#: en/help_topics/authentication.txt:221
8783
msgid ""
8784
"* update the credentials when the user is prompted for user or password,"
8785
msgstr ""
8786
8787
#: en/help_topics/authentication.txt:223
8788
msgid "* add a ``verify_certificates`` field for ``HTTPS``."
8789
msgstr ""
8790
8791
#: en/help_topics/authentication.txt:225
8792
msgid ""
8793
"The ``password_encoding`` and ``verify_certificates`` fields are recognized "
8794
"but\n"
8795
"ignored in the actual implementation.\n"
8796
msgstr ""
8797
8798
#: en/help_topics/bugs.txt:1
8799
msgid "Bug Tracker Settings"
8800
msgstr ""
8801
8802
#: en/help_topics/bugs.txt:3
8803
msgid ""
8804
"When making a commit, metadata about bugs fixed by that change can be\n"
8805
"recorded by using the ``--fixes`` option. For each bug marked as fixed, an\n"
8806
"entry is included in the 'bugs' revision property stating '<url> <status>'.\n"
8807
"(The only ``status`` value currently supported is ``fixed.``)"
8808
msgstr ""
8809
8810
#: en/help_topics/bugs.txt:8
8811
msgid ""
8812
"The ``--fixes`` option allows you to specify a bug tracker and a bug "
8813
"identifier\n"
8814
"rather than a full URL. This looks like::"
8815
msgstr ""
8816
8817
#: en/help_topics/bugs.txt:11
8818
msgid " bzr commit --fixes <tracker>:<id>"
8819
msgstr ""
8820
8821
#: en/help_topics/bugs.txt:13 en/help_topics/configuration.txt:398
8822
msgid "or::"
8823
msgstr ""
8824
8825
#: en/help_topics/bugs.txt:15
8826
msgid " bzr commit --fixes <id>"
8827
msgstr ""
8828
8829
#: en/help_topics/bugs.txt:17
8830
msgid ""
8831
"where \"<tracker>\" is an identifier for the bug tracker, and \"<id>\" is "
8832
"the\n"
8833
"identifier for that bug within the bugtracker, usually the bug number.\n"
8834
"If \"<tracker>\" is not specified the ``bugtracker`` set in the branch\n"
8835
"or global configuration is used."
8836
msgstr ""
8837
8838
#: en/help_topics/bugs.txt:22
8839
msgid ""
8840
"Bazaar knows about a few bug trackers that have many users. If\n"
8841
"you use one of these bug trackers then there is no setup required to\n"
8842
"use this feature, you just need to know the tracker identifier to use.\n"
8843
"These are the bugtrackers that are built in:"
8844
msgstr ""
8845
8846
#: en/help_topics/bugs.txt:27
8847
msgid ""
8848
" ============================ ============ ============\n"
8849
" URL Abbreviation Example\n"
8850
" ============================ ============ ============\n"
8851
" https://bugs.launchpad.net/ lp lp:12345\n"
8852
" http://bugs.debian.org/ deb deb:12345\n"
8853
" http://bugzilla.gnome.org/ gnome gnome:12345\n"
8854
" ============================ ============ ============"
8855
msgstr ""
8856
8857
#: en/help_topics/bugs.txt:35
8858
msgid ""
8859
"For the bug trackers not listed above configuration is required.\n"
8860
"Support for generating the URLs for any project using Bugzilla or Trac\n"
8861
"is built in, along with a template mechanism for other bugtrackers with\n"
8862
"simple URL schemes. If your bug tracker can't be described by one\n"
8863
"of the schemes described below then you can write a plugin to support\n"
8864
"it."
8865
msgstr ""
8866
8867
#: en/help_topics/bugs.txt:42
8868
msgid ""
8869
"If you use Bugzilla or Trac, then you only need to set a configuration\n"
8870
"variable which contains the base URL of the bug tracker. These options\n"
8871
"can go into ``bazaar.conf``, ``branch.conf`` or into a branch-specific\n"
8872
"configuration section in ``locations.conf``. You can set up these values\n"
8873
"for each of the projects you work on."
8874
msgstr ""
8875
8876
#: en/help_topics/bugs.txt:48
8877
msgid ""
8878
"Note: As you provide a short name for each tracker, you can specify one or\n"
8879
"more bugs in one or more trackers at commit time if you wish."
8880
msgstr ""
8881
8882
#: en/help_topics/bugs.txt:51
8883
msgid ""
8884
"Launchpad\n"
8885
"---------"
8886
msgstr ""
8887
8888
#: en/help_topics/bugs.txt:54
8889
msgid ""
8890
"Use ``bzr commit --fixes lp:2`` to record that this commit fixes bug 2."
8891
msgstr ""
8892
8893
#: en/help_topics/bugs.txt:56
8894
msgid ""
8895
"bugzilla_<tracker>_url\n"
8896
"----------------------"
8897
msgstr ""
8898
8899
#: en/help_topics/bugs.txt:59
8900
msgid ""
8901
"If present, the location of the Bugzilla bug tracker referred to by\n"
8902
"<tracker>. This option can then be used together with ``bzr commit\n"
8903
"--fixes`` to mark bugs in that tracker as being fixed by that commit. For\n"
8904
"example::"
8905
msgstr ""
8906
8907
#: en/help_topics/bugs.txt:64
8908
msgid " bugzilla_squid_url = http://bugs.squid-cache.org"
8909
msgstr ""
8910
8911
#: en/help_topics/bugs.txt:66
8912
msgid ""
8913
"would allow ``bzr commit --fixes squid:1234`` to mark Squid's bug 1234 as\n"
8914
"fixed."
8915
msgstr ""
8916
8917
#: en/help_topics/bugs.txt:69
8918
msgid ""
8919
"trac_<tracker>_url\n"
8920
"------------------"
8921
msgstr ""
8922
8923
#: en/help_topics/bugs.txt:72
8924
msgid ""
8925
"If present, the location of the Trac instance referred to by\n"
8926
"<tracker>. This option can then be used together with ``bzr commit\n"
8927
"--fixes`` to mark bugs in that tracker as being fixed by that commit. For\n"
8928
"example::"
8929
msgstr ""
8930
8931
#: en/help_topics/bugs.txt:77
8932
msgid " trac_twisted_url = http://www.twistedmatrix.com/trac"
8933
msgstr ""
8934
8935
#: en/help_topics/bugs.txt:79
8936
msgid ""
8937
"would allow ``bzr commit --fixes twisted:1234`` to mark Twisted's bug 1234 "
8938
"as\n"
8939
"fixed."
8940
msgstr ""
8941
8942
#: en/help_topics/bugs.txt:82
8943
msgid ""
8944
"bugtracker_<tracker>_url\n"
8945
"------------------------"
8946
msgstr ""
8947
8948
#: en/help_topics/bugs.txt:85
8949
msgid ""
8950
"If present, the location of a generic bug tracker instance referred to by\n"
8951
"<tracker>. The location must contain an ``{id}`` placeholder,\n"
8952
"which will be replaced by a specific bug ID. This option can then be used\n"
8953
"together with ``bzr commit --fixes`` to mark bugs in that tracker as being\n"
8954
"fixed by that commit. For example::"
8955
msgstr ""
8956
8957
#: en/help_topics/bugs.txt:91
8958
msgid " bugtracker_python_url = http://bugs.python.org/issue{id}"
8959
msgstr ""
8960
8961
#: en/help_topics/bugs.txt:93
8962
msgid ""
8963
"would allow ``bzr commit --fixes python:1234`` to mark bug 1234 in Python's\n"
8964
"Roundup bug tracker as fixed, or::"
8965
msgstr ""
8966
8967
#: en/help_topics/bugs.txt:96
8968
msgid ""
8969
" bugtracker_cpan_url = http://rt.cpan.org/Public/Bug/Display.html?id={id}"
8970
msgstr ""
8971
8972
#: en/help_topics/bugs.txt:98
8973
msgid ""
8974
"would allow ``bzr commit --fixes cpan:1234`` to mark bug 1234 in CPAN's\n"
8975
"RT bug tracker as fixed, or::"
8976
msgstr ""
8977
8978
#: en/help_topics/bugs.txt:101
8979
msgid " bugtracker_hudson_url = http://issues.hudson-ci.org/browse/{id}"
8980
msgstr ""
8981
8982
#: en/help_topics/bugs.txt:103
8983
msgid ""
8984
"would allow ``bzr commit --fixes hudson:HUDSON-1234`` to mark bug HUDSON-"
8985
"1234\n"
8986
"in Hudson's JIRA bug tracker as fixed.\n"
8987
msgstr ""
8988
8989
#: en/help_topics/commands.txt:1
8990
msgid ""
8991
"add Add specified files or directories.\n"
8992
"alias Set/unset and display aliases.\n"
8993
"annotate Show the origin of each line in a file.\n"
8994
"bash-completion Generate a shell function for bash command line "
8995
"completion.\n"
8996
" [bash_completion]\n"
8997
"bind Convert the current branch into a checkout of the "
8998
"supplied\n"
8999
" branch.\n"
9000
"branch Create a new branch that is a copy of an existing branch.\n"
9001
"branches List the branches available at the current location.\n"
9002
"break-lock Break a dead lock.\n"
9003
"cat Write the contents of a file as of a given revision to\n"
9004
" standard output.\n"
9005
"check Validate working tree structure, branch consistency and\n"
9006
" repository history.\n"
9007
"checkout Create a new checkout of an existing branch.\n"
9008
"clean-tree Remove unwanted files from working tree.\n"
9009
"commit Commit changes into a new revision.\n"
9010
"config Display, set or remove a configuration option.\n"
9011
"conflicts List files with conflicts.\n"
9012
"deleted List files deleted in the working tree.\n"
9013
"diff Show differences in the working tree, between revisions "
9014
"or\n"
9015
" branches.\n"
9016
"dpush Push into a different VCS without any custom bzr "
9017
"metadata.\n"
9018
"export Export current or past revision to a destination directory "
9019
"or\n"
9020
" archive.\n"
9021
"help Show help on a command or other topic.\n"
9022
"ignore Ignore specified files or patterns.\n"
9023
"ignored List ignored files and the patterns that matched them.\n"
9024
"info Show information about a working tree, branch or "
9025
"repository.\n"
9026
"init Make a directory into a versioned branch.\n"
9027
"init-repository Create a shared repository for branches to share storage\n"
9028
" space.\n"
9029
"join Combine a tree into its containing tree.\n"
9030
"launchpad-login Show or set the Launchpad user ID. [launchpad]\n"
9031
"launchpad-mirror Ask Launchpad to mirror a branch now. [launchpad]\n"
9032
"launchpad-open Open a Launchpad branch page in your web browser. "
9033
"[launchpad]\n"
9034
"log Show historical log for a branch or subset of a branch.\n"
9035
"lp-find-proposal Find the proposal to merge this revision. [launchpad]\n"
9036
"lp-propose-merge Propose merging a branch on Launchpad. [launchpad]\n"
9037
"ls List files in a tree.\n"
9038
"merge Perform a three-way merge.\n"
9039
"missing Show unmerged/unpulled revisions between two branches.\n"
9040
"mkdir Create a new versioned directory.\n"
9041
"mv Move or rename a file.\n"
9042
"nick Print or set the branch nickname.\n"
9043
"pack Compress the data within a repository.\n"
9044
"plugins List the installed plugins.\n"
9045
"pull Turn this branch into a mirror of another branch.\n"
9046
"push Update a mirror of this branch.\n"
9047
"reconcile Reconcile bzr metadata in a branch.\n"
9048
"reconfigure Reconfigure the type of a bzr directory.\n"
9049
"register-branch Register a branch with launchpad.net. [launchpad]\n"
9050
"remerge Redo a merge.\n"
9051
"remove Remove files or directories.\n"
9052
"remove-branch Remove a branch.\n"
9053
"remove-tree Remove the working tree from a given branch/checkout.\n"
9054
"renames Show list of renamed files.\n"
9055
"resolve Mark a conflict as resolved.\n"
9056
"revert Revert files to a previous revision.\n"
9057
"revno Show current revision number.\n"
9058
"root Show the tree root directory.\n"
9059
"send Mail or create a merge-directive for submitting changes.\n"
9060
"serve Run the bzr server.\n"
9061
"shelve Temporarily set aside some changes from the current tree.\n"
9062
"sign-my-commits Sign all commits by a given committer.\n"
9063
"split Split a subdirectory of a tree into a separate tree.\n"
9064
"status Display status summary.\n"
9065
"switch Set the branch of a checkout and update.\n"
9066
"tag Create, remove or modify a tag naming a revision.\n"
9067
"tags List tags.\n"
9068
"testament Show testament (signing-form) of a revision.\n"
9069
"unbind Convert the current checkout into a regular branch.\n"
9070
"uncommit Remove the last committed revision.\n"
9071
"unshelve Restore shelved changes.\n"
9072
"update Update a working tree to a new revision.\n"
9073
"upgrade Upgrade a repository, branch or working tree to a newer\n"
9074
" format.\n"
9075
"verify-signatures Verify all commit signatures.\n"
9076
"version Show version of bzr.\n"
9077
"version-info Show version information about this tree.\n"
9078
"view Manage filtered views.\n"
9079
"whoami Show or set bzr user id.\n"
9080
msgstr ""
9081
9082
#: en/help_topics/configuration.txt:1
9083
msgid ""
9084
"Configuration Settings\n"
9085
"======================="
9086
msgstr ""
9087
9088
#: en/help_topics/configuration.txt:4
9089
msgid ""
9090
"Environment settings\n"
9091
"---------------------"
9092
msgstr ""
9093
9094
#: en/help_topics/configuration.txt:7
9095
msgid ""
9096
"While most configuration is handled by configuration files, some options\n"
9097
"which may be semi-permanent can also be controlled through the environment."
9098
msgstr ""
9099
9100
#: en/help_topics/configuration.txt:10
9101
msgid ""
9102
"BZR_EMAIL\n"
9103
"~~~~~~~~~"
9104
msgstr ""
9105
9106
#: en/help_topics/configuration.txt:13
9107
msgid "Override the email id used by Bazaar. Typical format::"
9108
msgstr ""
9109
9110
#: en/help_topics/configuration.txt:15
9111
msgid " \"John Doe <jdoe@example.com>\""
9112
msgstr ""
9113
9114
#: en/help_topics/configuration.txt:17
9115
msgid "See also the ``email`` configuration option."
9116
msgstr ""
9117
9118
#: en/help_topics/configuration.txt:19
9119
msgid ""
9120
"BZR_PROGRESS_BAR\n"
9121
"~~~~~~~~~~~~~~~~"
9122
msgstr ""
9123
9124
#: en/help_topics/configuration.txt:22
9125
msgid ""
9126
"Override the progress display. Possible values are \"none\" or \"text\". "
9127
"If\n"
9128
"the value is \"none\" then no progress bar is displayed. The value \"text\" "
9129
"draws\n"
9130
"the ordinary command line progress bar."
9131
msgstr ""
9132
9133
#: en/help_topics/configuration.txt:26
9134
msgid ""
9135
"BZR_SIGQUIT_PDB\n"
9136
"~~~~~~~~~~~~~~~"
9137
msgstr ""
9138
9139
#: en/help_topics/configuration.txt:29
9140
msgid ""
9141
"Control whether SIGQUIT behaves normally or invokes a breakin debugger."
9142
msgstr ""
9143
9144
#: en/help_topics/configuration.txt:31
9145
msgid ""
9146
"* 0 = Standard SIGQUIT behavior (normally, exit with a core dump)\n"
9147
"* 1 = Invoke breakin debugger (default)"
9148
msgstr ""
9149
9150
#: en/help_topics/configuration.txt:34
9151
msgid ""
9152
"BZR_HOME\n"
9153
"~~~~~~~~"
9154
msgstr ""
9155
9156
#: en/help_topics/configuration.txt:37
9157
msgid "Override the home directory used by Bazaar."
9158
msgstr ""
9159
9160
#: en/help_topics/configuration.txt:39
9161
msgid ""
9162
"BZR_SSH\n"
9163
"~~~~~~~"
9164
msgstr ""
9165
9166
#: en/help_topics/configuration.txt:42
9167
msgid "Select a different SSH implementation."
9168
msgstr ""
9169
9170
#: en/help_topics/configuration.txt:44
9171
msgid ""
9172
"BZR_PDB\n"
9173
"~~~~~~~"
9174
msgstr ""
9175
9176
#: en/help_topics/configuration.txt:47
9177
msgid "Control whether to launch a debugger on error."
9178
msgstr ""
9179
9180
#: en/help_topics/configuration.txt:49
9181
msgid ""
9182
"* 0 = Standard behavior\n"
9183
"* 1 = Launch debugger"
9184
msgstr ""
9185
9186
#: en/help_topics/configuration.txt:52
9187
msgid ""
9188
"BZR_REMOTE_PATH\n"
9189
"~~~~~~~~~~~~~~~"
9190
msgstr ""
9191
9192
#: en/help_topics/configuration.txt:55
9193
msgid "Path to the Bazaar executable to use when using the bzr+ssh protocol."
9194
msgstr ""
9195
9196
#: en/help_topics/configuration.txt:57
9197
msgid "See also the ``bzr_remote_path`` configuration option."
9198
msgstr ""
9199
9200
#: en/help_topics/configuration.txt:59
9201
msgid ""
9202
"BZR_EDITOR\n"
9203
"~~~~~~~~~~"
9204
msgstr ""
9205
9206
#: en/help_topics/configuration.txt:62
9207
msgid "Path to the editor Bazaar should use for commit messages, etc."
9208
msgstr ""
9209
9210
#: en/help_topics/configuration.txt:64
9211
msgid ""
9212
"BZR_LOG\n"
9213
"~~~~~~~"
9214
msgstr ""
9215
9216
#: en/help_topics/configuration.txt:67
9217
msgid ""
9218
"Location of the Bazaar log file. You can check the current location by\n"
9219
"running ``bzr version``."
9220
msgstr ""
9221
9222
#: en/help_topics/configuration.txt:70
9223
msgid ""
9224
"The log file contains debug information that is useful for diagnosing or\n"
9225
"reporting problems with Bazaar."
9226
msgstr ""
9227
9228
#: en/help_topics/configuration.txt:73
9229
msgid ""
9230
"Setting this to ``NUL`` on Windows or ``/dev/null`` on other platforms\n"
9231
"will disable logging."
9232
msgstr ""
9233
9234
#: en/help_topics/configuration.txt:76
9235
msgid ""
9236
"\n"
9237
"BZR_PLUGIN_PATH\n"
9238
"~~~~~~~~~~~~~~~"
9239
msgstr ""
9240
9241
#: en/help_topics/configuration.txt:80
9242
msgid ""
9243
"The path to the plugins directory that Bazaar should use.\n"
9244
"If not set, Bazaar will search for plugins in:"
9245
msgstr ""
9246
9247
#: en/help_topics/configuration.txt:83
9248
msgid ""
9249
"* the user specific plugin directory (containing the ``user`` plugins),"
9250
msgstr ""
9251
9252
#: en/help_topics/configuration.txt:85
9253
msgid "* the bzrlib directory (containing the ``core`` plugins),"
9254
msgstr ""
9255
9256
#: en/help_topics/configuration.txt:87
9257
msgid ""
9258
"* the site specific plugin directory if applicable (containing\n"
9259
" the ``site`` plugins)."
9260
msgstr ""
9261
9262
#: en/help_topics/configuration.txt:90
9263
msgid ""
9264
"If ``BZR_PLUGIN_PATH`` is set in any fashion, it will change the\n"
9265
"the way the plugin are searched. "
9266
msgstr ""
9267
9268
#: en/help_topics/configuration.txt:93
9269
msgid ""
9270
"As for the ``PATH`` variables, if multiple directories are\n"
9271
"specified in ``BZR_PLUGIN_PATH`` they should be separated by the\n"
9272
"platform specific appropriate character (':' on Unix,\n"
9273
"';' on windows)"
9274
msgstr ""
9275
9276
#: en/help_topics/configuration.txt:98
9277
msgid ""
9278
"By default if ``BZR_PLUGIN_PATH`` is set, it replaces searching\n"
9279
"in ``user``. However it will continue to search in ``core`` and\n"
9280
"``site`` unless they are explicitly removed."
9281
msgstr ""
9282
9283
#: en/help_topics/configuration.txt:102
9284
msgid ""
9285
"If you need to change the order or remove one of these\n"
9286
"directories, you should use special values:"
9287
msgstr ""
9288
9289
#: en/help_topics/configuration.txt:105
9290
msgid ""
9291
"* ``-user``, ``-core``, ``-site`` will remove the corresponding\n"
9292
" path from the default values,"
9293
msgstr ""
9294
9295
#: en/help_topics/configuration.txt:108
9296
msgid ""
9297
"* ``+user``, ``+core``, ``+site`` will add the corresponding path\n"
9298
" before the remaining default values (and also remove it from\n"
9299
" the default values)."
9300
msgstr ""
9301
9302
#: en/help_topics/configuration.txt:112
9303
msgid ""
9304
"Note that the special values 'user', 'core' and 'site' should be\n"
9305
"used literally, they will be substituted by the corresponding,\n"
9306
"platform specific, values."
9307
msgstr ""
9308
9309
#: en/help_topics/configuration.txt:116
9310
msgid ""
9311
"The examples below use ':' as the separator, windows users\n"
9312
"should use ';'."
9313
msgstr ""
9314
9315
#: en/help_topics/configuration.txt:119
9316
msgid "Overriding the default user plugin directory::"
9317
msgstr ""
9318
9319
#: en/help_topics/configuration.txt:121
9320
msgid " BZR_PLUGIN_PATH='/path/to/my/other/plugins'"
9321
msgstr ""
9322
9323
#: en/help_topics/configuration.txt:123
9324
msgid "Disabling the site directory while retaining the user directory::"
9325
msgstr ""
9326
9327
#: en/help_topics/configuration.txt:125
9328
msgid " BZR_PLUGIN_PATH='-site:+user'"
9329
msgstr ""
9330
9331
#: en/help_topics/configuration.txt:127
9332
msgid "Disabling all plugins (better achieved with --no-plugins)::"
9333
msgstr ""
9334
9335
#: en/help_topics/configuration.txt:129
9336
msgid " BZR_PLUGIN_PATH='-user:-core:-site'"
9337
msgstr ""
9338
9339
#: en/help_topics/configuration.txt:131
9340
msgid "Overriding the default site plugin directory::"
9341
msgstr ""
9342
9343
#: en/help_topics/configuration.txt:133
9344
msgid " BZR_PLUGIN_PATH='/path/to/my/site/plugins:-site':+user"
9345
msgstr ""
9346
9347
#: en/help_topics/configuration.txt:135
9348
msgid ""
9349
"BZR_DISABLE_PLUGINS\n"
9350
"~~~~~~~~~~~~~~~~~~~"
9351
msgstr ""
9352
9353
#: en/help_topics/configuration.txt:138
9354
msgid ""
9355
"Under special circumstances (mostly when trying to diagnose a\n"
9356
"bug), it's better to disable a plugin (or several) rather than\n"
9357
"uninstalling them completely. Such plugins can be specified in\n"
9358
"the ``BZR_DISABLE_PLUGINS`` environment variable."
9359
msgstr ""
9360
9361
#: en/help_topics/configuration.txt:143
9362
msgid ""
9363
"In that case, ``bzr`` will stop loading the specified plugins and\n"
9364
"will raise an import error if they are explicitly imported (by\n"
9365
"another plugin that depends on them for example)."
9366
msgstr ""
9367
9368
#: en/help_topics/configuration.txt:147
9369
msgid "Disabling ``myplugin`` and ``yourplugin`` is achieved by::"
9370
msgstr ""
9371
9372
#: en/help_topics/configuration.txt:149
9373
msgid " BZR_DISABLE_PLUGINS='myplugin:yourplugin'"
9374
msgstr ""
9375
9376
#: en/help_topics/configuration.txt:151
9377
msgid ""
9378
"BZR_PLUGINS_AT\n"
9379
"~~~~~~~~~~~~~~"
9380
msgstr ""
9381
9382
#: en/help_topics/configuration.txt:154
9383
msgid ""
9384
"When adding a new feature or working on a bug in a plugin,\n"
9385
"developers often need to use a specific version of a given\n"
9386
"plugin. Since python requires that the directory containing the\n"
9387
"code is named like the plugin itself this make it impossible to\n"
9388
"use arbitrary directory names (using a two-level directory scheme\n"
9389
"is inconvenient). ``BZR_PLUGINS_AT`` allows such directories even\n"
9390
"if they don't appear in ``BZR_PLUGIN_PATH`` ."
9391
msgstr ""
9392
9393
#: en/help_topics/configuration.txt:162
9394
msgid ""
9395
"Plugins specified in this environment variable takes precedence\n"
9396
"over the ones in ``BZR_PLUGIN_PATH``."
9397
msgstr ""
9398
9399
#: en/help_topics/configuration.txt:165
9400
msgid ""
9401
"The variable specified a list of ``plugin_name@plugin path``,\n"
9402
"``plugin_name`` being the name of the plugin as it appears in\n"
9403
"python module paths, ``plugin_path`` being the path to the\n"
9404
"directory containing the plugin code itself\n"
9405
"(i.e. ``plugins/myplugin`` not ``plugins``). Use ':' as the list\n"
9406
"separator, use ';' on windows."
9407
msgstr ""
9408
9409
#: en/help_topics/configuration.txt:172
9410
msgid ""
9411
"Example:\n"
9412
"~~~~~~~~"
9413
msgstr ""
9414
9415
#: en/help_topics/configuration.txt:175
9416
msgid ""
9417
"Using a specific version of ``myplugin``:\n"
9418
"``BZR_PLUGINS_AT='myplugin@/home/me/bugfixes/123456-myplugin``"
9419
msgstr ""
9420
9421
#: en/help_topics/configuration.txt:178
9422
msgid ""
9423
"BZRPATH\n"
9424
"~~~~~~~"
9425
msgstr ""
9426
9427
#: en/help_topics/configuration.txt:181
9428
msgid "The path where Bazaar should look for shell plugin external commands."
9429
msgstr ""
9430
9431
#: en/help_topics/configuration.txt:183
9432
msgid ""
9433
"\n"
9434
"http_proxy, https_proxy\n"
9435
"~~~~~~~~~~~~~~~~~~~~~~~"
9436
msgstr ""
9437
9438
#: en/help_topics/configuration.txt:187
9439
msgid "Specifies the network proxy for outgoing connections, for example::"
9440
msgstr ""
9441
9442
#: en/help_topics/configuration.txt:189
9443
msgid ""
9444
" http_proxy=http://proxy.example.com:3128/ \n"
9445
" https_proxy=http://proxy.example.com:3128/"
9446
msgstr ""
9447
9448
#: en/help_topics/configuration.txt:192
9449
msgid ""
9450
"\n"
9451
"Configuration files\n"
9452
"-------------------"
9453
msgstr ""
9454
9455
#: en/help_topics/configuration.txt:196
9456
msgid ""
9457
"Location\n"
9458
"~~~~~~~~"
9459
msgstr ""
9460
9461
#: en/help_topics/configuration.txt:199
9462
msgid ""
9463
"Configuration files are located in ``$HOME/.bazaar`` on Unix and\n"
9464
"``C:\\Documents and Settings\\<username>\\Application Data\\Bazaar\\2.0`` "
9465
"on\n"
9466
"Windows. (You can check the location for your system by using\n"
9467
"``bzr version``.)"
9468
msgstr ""
9469
9470
#: en/help_topics/configuration.txt:204
9471
msgid "There are three primary configuration files in this location:"
9472
msgstr ""
9473
9474
#: en/help_topics/configuration.txt:206
9475
msgid "* ``bazaar.conf`` describes default configuration options,"
9476
msgstr ""
9477
9478
#: en/help_topics/configuration.txt:208
9479
msgid ""
9480
"* ``locations.conf`` describes configuration information for\n"
9481
" specific branch locations,"
9482
msgstr ""
9483
9484
#: en/help_topics/configuration.txt:211
9485
msgid ""
9486
"* ``authentication.conf`` describes credential information for\n"
9487
" remote servers."
9488
msgstr ""
9489
9490
#: en/help_topics/configuration.txt:214
9491
msgid ""
9492
"Each branch can also contain a configuration file that sets values specific\n"
9493
"to that branch. This file is found at ``.bzr/branch/branch.conf`` within "
9494
"the\n"
9495
"branch. This file is visible to all users of a branch, if you wish to "
9496
"override\n"
9497
"one of the values for a branch with a setting that is specific to you then "
9498
"you\n"
9499
"can do so in ``locations.conf``."
9500
msgstr ""
9501
9502
#: en/help_topics/configuration.txt:220
9503
msgid ""
9504
"General format\n"
9505
"~~~~~~~~~~~~~~"
9506
msgstr ""
9507
9508
#: en/help_topics/configuration.txt:223
9509
msgid ""
9510
"An ini file has three types of contructs: section headers, section\n"
9511
"options and comments."
9512
msgstr ""
9513
9514
#: en/help_topics/configuration.txt:226
9515
msgid ""
9516
"Comments\n"
9517
"^^^^^^^^"
9518
msgstr ""
9519
9520
#: en/help_topics/configuration.txt:229
9521
msgid ""
9522
"A comment is any line that starts with a \"#\" (sometimes called a \"hash\n"
9523
"mark\", \"pound sign\" or \"number sign\"). Comment lines are ignored by\n"
9524
"Bazaar when parsing ini files."
9525
msgstr ""
9526
9527
#: en/help_topics/configuration.txt:233
9528
msgid ""
9529
"Section headers\n"
9530
"^^^^^^^^^^^^^^^"
9531
msgstr ""
9532
9533
#: en/help_topics/configuration.txt:236
9534
msgid ""
9535
"A section header is a word enclosed in brackets that starts at the begining\n"
9536
"of a line. A typical section header looks like this::"
9537
msgstr ""
9538
9539
#: en/help_topics/configuration.txt:239
9540
msgid " [DEFAULT]"
9541
msgstr ""
9542
9543
#: en/help_topics/configuration.txt:241
9544
msgid ""
9545
"The only valid section headers for bazaar.conf currently are [DEFAULT] and\n"
9546
"[ALIASES]. Section headers are case sensitive. The default section provides "
9547
"for\n"
9548
"setting options which can be overridden with the branch config file."
9549
msgstr ""
9550
9551
#: en/help_topics/configuration.txt:245
9552
msgid ""
9553
"For ``locations.conf``, the options from the section with the\n"
9554
"longest matching section header are used to the exclusion of other\n"
9555
"potentially valid section headers. A section header uses the path for\n"
9556
"the branch as the section header. Some examples include::"
9557
msgstr ""
9558
9559
#: en/help_topics/configuration.txt:250
9560
msgid ""
9561
" [http://mybranches.isp.com/~jdoe/branchdir]\n"
9562
" [/home/jdoe/branches/]"
9563
msgstr ""
9564
9565
#: en/help_topics/configuration.txt:253
9566
msgid ""
9567
"\n"
9568
"Section options\n"
9569
"^^^^^^^^^^^^^^^"
9570
msgstr ""
9571
9572
#: en/help_topics/configuration.txt:257
9573
msgid ""
9574
"A section option resides within a section. A section option contains an\n"
9575
"option name, an equals sign and a value. For example::"
9576
msgstr ""
9577
9578
#: en/help_topics/configuration.txt:260
9579
msgid ""
9580
" email = John Doe <jdoe@isp.com>\n"
9581
" gpg_signing_key = Amy Pond <amy@example.com>"
9582
msgstr ""
9583
9584
#: en/help_topics/configuration.txt:263
9585
msgid ""
9586
"A option can reference other options by enclosing them in curly brackets::"
9587
msgstr ""
9588
9589
#: en/help_topics/configuration.txt:265
9590
msgid ""
9591
" my_branch_name = feature_x\n"
9592
" my_server = bzr+ssh://example.com\n"
9593
" push_location = {my_server}/project/{my_branch_name}"
9594
msgstr ""
9595
9596
#: en/help_topics/configuration.txt:269
9597
msgid ""
9598
"Option policies\n"
9599
"^^^^^^^^^^^^^^^"
9600
msgstr ""
9601
9602
#: en/help_topics/configuration.txt:272
9603
msgid ""
9604
"Options defined in a section affect the named directory or URL plus\n"
9605
"any locations they contain. Policies can be used to change how an\n"
9606
"option value is interpreted for contained locations. Currently\n"
9607
"there are three policies available:"
9608
msgstr ""
9609
9610
#: en/help_topics/configuration.txt:277
9611
msgid ""
9612
" none:\n"
9613
" the value is interpreted the same for contained locations. This is\n"
9614
" the default behaviour.\n"
9615
" norecurse:\n"
9616
" the value is only used for the exact location specified by the\n"
9617
" section name.\n"
9618
" appendpath:\n"
9619
" for contained locations, any additional path components are\n"
9620
" appended to the value."
9621
msgstr ""
9622
9623
#: en/help_topics/configuration.txt:287
9624
msgid ""
9625
"Policies are specified by keys with names of the form "
9626
"\"<option_name>:policy\".\n"
9627
"For example, to define the push location for a tree of branches, the\n"
9628
"following could be used::"
9629
msgstr ""
9630
9631
#: en/help_topics/configuration.txt:291
9632
msgid ""
9633
" [/top/location]\n"
9634
" push_location = sftp://example.com/location\n"
9635
" push_location:policy = appendpath"
9636
msgstr ""
9637
9638
#: en/help_topics/configuration.txt:295
9639
msgid ""
9640
"With this configuration, the push location for ``/top/location/branch1``\n"
9641
"would be ``sftp://example.com/location/branch1``."
9642
msgstr ""
9643
9644
#: en/help_topics/configuration.txt:298
9645
msgid ""
9646
"Section local options\n"
9647
"^^^^^^^^^^^^^^^^^^^^^"
9648
msgstr ""
9649
9650
#: en/help_topics/configuration.txt:301
9651
msgid ""
9652
"Some options are defined automatically inside a given section and can be\n"
9653
"refered to in this section only. "
9654
msgstr ""
9655
9656
#: en/help_topics/configuration.txt:304
9657
msgid "For example, the ``appendpath`` policy can be used like this::"
9658
msgstr ""
9659
9660
#: en/help_topics/configuration.txt:306
9661
msgid ""
9662
" [/home/vila/src/bzr/bugs]\n"
9663
" mypush = lp:~vila/bzr\n"
9664
" mypush:policy=appendpath"
9665
msgstr ""
9666
9667
#: en/help_topics/configuration.txt:310
9668
msgid "Using ``relpath`` to achieve the same result is done like this::"
9669
msgstr ""
9670
9671
#: en/help_topics/configuration.txt:312
9672
msgid ""
9673
" [/home/vila/src/bzr/bugs]\n"
9674
" mypush = lp:~vila/bzr/{relpath}"
9675
msgstr ""
9676
9677
#: en/help_topics/configuration.txt:315
9678
msgid ""
9679
"In both cases, when used in a directory like\n"
9680
"``/home/vila/src/bzr/bugs/832013-expand-in-stack`` we'll get::"
9681
msgstr ""
9682
9683
#: en/help_topics/configuration.txt:318 en/help_topics/configuration.txt:329
9684
msgid ""
9685
" $ bzr config mypush\n"
9686
" lp:~vila/bzr/832013-expand-in-stack"
9687
msgstr ""
9688
9689
#: en/help_topics/configuration.txt:321
9690
msgid "Another such option is ``basename`` which can be used like this::"
9691
msgstr ""
9692
9693
#: en/help_topics/configuration.txt:323
9694
msgid ""
9695
" [/home/vila/src/bzr]\n"
9696
" mypush = lp:~vila/bzr/{basename}"
9697
msgstr ""
9698
9699
#: en/help_topics/configuration.txt:326
9700
msgid ""
9701
"When used in a directory like\n"
9702
"``/home/vila/src/bzr/bugs/832013-expand-in-stack`` we'll get::"
9703
msgstr ""
9704
9705
#: en/help_topics/configuration.txt:332
9706
msgid ""
9707
"Note that ``basename`` here refers to the base name of ``relpath`` which\n"
9708
"itself is defined as the relative path between the section name and the\n"
9709
"location it matches."
9710
msgstr ""
9711
9712
#: en/help_topics/configuration.txt:336
9713
msgid ""
9714
"When an option is local to a Section, it cannot be referred to from option\n"
9715
"values in any other section from the same ``Store`` nor from any other\n"
9716
"``Store``."
9717
msgstr ""
9718
9719
#: en/help_topics/configuration.txt:340
9720
msgid ""
9721
"\n"
9722
"The main configuration file, bazaar.conf\n"
9723
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
9724
msgstr ""
9725
9726
#: en/help_topics/configuration.txt:344
9727
msgid ""
9728
"``bazaar.conf`` allows two sections: ``[DEFAULT]`` and ``[ALIASES]``.\n"
9729
"The default section contains the default\n"
9730
"configuration options for all branches. The default section can be\n"
9731
"overriden by providing a branch-specific section in ``locations.conf``."
9732
msgstr ""
9733
9734
#: en/help_topics/configuration.txt:349
9735
msgid "A typical ``bazaar.conf`` section often looks like the following::"
9736
msgstr ""
9737
9738
#: en/help_topics/configuration.txt:351
9739
msgid ""
9740
" [DEFAULT]\n"
9741
" email = John Doe <jdoe@isp.com>\n"
9742
" editor = /usr/bin/vim\n"
9743
" create_signatures = when-required"
9744
msgstr ""
9745
9746
#: en/help_topics/configuration.txt:356
9747
msgid ""
9748
"\n"
9749
"The branch location configuration file, locations.conf\n"
9750
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
9751
msgstr ""
9752
9753
#: en/help_topics/configuration.txt:360
9754
msgid ""
9755
"``locations.conf`` allows one to specify overriding settings for\n"
9756
"a specific branch. The format is almost identical to the default section in\n"
9757
"bazaar.conf with one significant change: The section header, instead of "
9758
"saying\n"
9759
"default, will be the path to a branch that you wish to override a value\n"
9760
"for. The '?' and '*' wildcards are supported::"
9761
msgstr ""
9762
9763
#: en/help_topics/configuration.txt:366
9764
msgid ""
9765
" [/home/jdoe/branches/nethack]\n"
9766
" email = Nethack Admin <nethack@nethack.com>"
9767
msgstr ""
9768
9769
#: en/help_topics/configuration.txt:369
9770
msgid ""
9771
" [http://hypothetical.site.com/branches/devel-branch]\n"
9772
" create_signatures = always"
9773
msgstr ""
9774
9775
#: en/help_topics/configuration.txt:372
9776
msgid ""
9777
"The authentication configuration file, authentication.conf\n"
9778
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
9779
msgstr ""
9780
9781
#: en/help_topics/configuration.txt:375
9782
msgid ""
9783
"``authentication.conf`` allows one to specify credentials for\n"
9784
"remote servers. This can be used for all the supported transports and any "
9785
"part\n"
9786
"of bzr that requires authentication (smtp for example)."
9787
msgstr ""
9788
9789
#: en/help_topics/configuration.txt:379
9790
msgid ""
9791
"The syntax of the file obeys the same rules as the others except for the\n"
9792
"option policies which don't apply."
9793
msgstr ""
9794
9795
#: en/help_topics/configuration.txt:382
9796
msgid ""
9797
"For more information on the possible uses of the authentication "
9798
"configuration\n"
9799
"file see :doc:`authentication-help`."
9800
msgstr ""
9801
9802
#: en/help_topics/configuration.txt:385
9803
msgid ""
9804
"\n"
9805
"Common options\n"
9806
"--------------"
9807
msgstr ""
9808
9809
#: en/help_topics/configuration.txt:389
9810
msgid ""
9811
"debug_flags\n"
9812
"~~~~~~~~~~~"
9813
msgstr ""
9814
9815
#: en/help_topics/configuration.txt:392
9816
msgid ""
9817
"A comma-separated list of debugging options to turn on. The same values\n"
9818
"can be used as with the -D command-line option (see `help global-options`).\n"
9819
"For example::"
9820
msgstr ""
9821
9822
#: en/help_topics/configuration.txt:396
9823
msgid " debug_flags = hpss"
9824
msgstr ""
9825
9826
#: en/help_topics/configuration.txt:400
9827
msgid " debug_flags = hpss,evil"
9828
msgstr ""
9829
9830
#: en/help_topics/configuration.txt:402
9831
msgid ""
9832
"email\n"
9833
"~~~~~"
9834
msgstr ""
9835
9836
#: en/help_topics/configuration.txt:405
9837
msgid ""
9838
"The email address to use when committing a branch. Typically takes the form\n"
9839
"of::"
9840
msgstr ""
9841
9842
#: en/help_topics/configuration.txt:408
9843
msgid " email = Full Name <account@hostname.tld>"
9844
msgstr ""
9845
9846
#: en/help_topics/configuration.txt:410
9847
msgid ""
9848
"editor\n"
9849
"~~~~~~"
9850
msgstr ""
9851
9852
#: en/help_topics/configuration.txt:413
9853
msgid ""
9854
"The path of the editor that you wish to use if *bzr commit* is run without\n"
9855
"a commit message. This setting is trumped by the environment variable\n"
9856
"``BZR_EDITOR``, and overrides the ``VISUAL`` and ``EDITOR`` environment\n"
9857
"variables."
9858
msgstr ""
9859
9860
#: en/help_topics/configuration.txt:418
9861
msgid ""
9862
"log_format\n"
9863
"~~~~~~~~~~"
9864
msgstr ""
9865
9866
#: en/help_topics/configuration.txt:421
9867
msgid ""
9868
"The default log format to use. Standard log formats are ``long``, ``short``\n"
9869
"and ``line``. Additional formats may be provided by plugins. The default\n"
9870
"value is ``long``."
9871
msgstr ""
9872
9873
#: en/help_topics/configuration.txt:425
9874
msgid ""
9875
"check_signatures\n"
9876
"~~~~~~~~~~~~~~~~"
9877
msgstr ""
9878
9879
#: en/help_topics/configuration.txt:428
9880
msgid ""
9881
"Reserved for future use. These options will allow a policy for branches to\n"
9882
"require signatures."
9883
msgstr ""
9884
9885
#: en/help_topics/configuration.txt:431
9886
msgid ""
9887
"require\n"
9888
" The gnupg signature for revisions must be present and must be valid."
9889
msgstr ""
9890
9891
#: en/help_topics/configuration.txt:434
9892
msgid ""
9893
"ignore\n"
9894
" Do not check gnupg signatures of revisions."
9895
msgstr ""
9896
9897
#: en/help_topics/configuration.txt:437
9898
msgid ""
9899
"check-available\n"
9900
" (default) If gnupg signatures for revisions are present, check them.\n"
9901
" Bazaar will fail if it finds a bad signature, but will not fail if\n"
9902
" no signature is present."
9903
msgstr ""
9904
9905
#: en/help_topics/configuration.txt:442
9906
msgid ""
9907
"create_signatures\n"
9908
"~~~~~~~~~~~~~~~~~"
9909
msgstr ""
9910
9911
#: en/help_topics/configuration.txt:445
9912
msgid ""
9913
"Defines the behaviour of signing revisions on commits. By default bzr will "
9914
"not\n"
9915
"sign new commits."
9916
msgstr ""
9917
9918
#: en/help_topics/configuration.txt:448
9919
msgid ""
9920
"always\n"
9921
" Sign every new revision that is committed. If the signing fails then "
9922
"the\n"
9923
" commit will not be made."
9924
msgstr ""
9925
9926
#: en/help_topics/configuration.txt:452
9927
msgid ""
9928
"when-required\n"
9929
" Reserved for future use."
9930
msgstr ""
9931
9932
#: en/help_topics/configuration.txt:455
9933
msgid ""
9934
"never\n"
9935
" Reserved for future use."
9936
msgstr ""
9937
9938
#: en/help_topics/configuration.txt:458
9939
msgid ""
9940
"In future it is planned that ``when-required`` will sign newly\n"
9941
"committed revisions only when the branch requires them. ``never`` will "
9942
"refuse\n"
9943
"to sign newly committed revisions, even if the branch requires signatures."
9944
msgstr ""
9945
9946
#: en/help_topics/configuration.txt:462
9947
msgid ""
9948
"dirstate.fdatasync\n"
9949
"~~~~~~~~~~~~~~~~~~"
9950
msgstr ""
9951
9952
#: en/help_topics/configuration.txt:465
9953
msgid ""
9954
"If true (default), working tree metadata changes are flushed through the\n"
9955
"OS buffers to physical disk. This is somewhat slower, but means data\n"
9956
"should not be lost if the machine crashes. See also repository.fdatasync."
9957
msgstr ""
9958
9959
#: en/help_topics/configuration.txt:469
9960
msgid ""
9961
"gpg_signing_key\n"
9962
"~~~~~~~~~~~~~~~"
9963
msgstr ""
9964
9965
#: en/help_topics/configuration.txt:472
9966
msgid ""
9967
"The GnuPG user identity to use when signing commits. Can be an e-mail\n"
9968
"address, key fingerprint or full key ID. When unset or when set to\n"
9969
"\"default\" Bazaar will use the user e-mail set with ``whoami``."
9970
msgstr ""
9971
9972
#: en/help_topics/configuration.txt:476
9973
msgid ""
9974
"recurse\n"
9975
"~~~~~~~"
9976
msgstr ""
9977
9978
#: en/help_topics/configuration.txt:479
9979
msgid ""
9980
"Only useful in ``locations.conf``. Defines whether or not the\n"
9981
"configuration for this section applies to subdirectories:"
9982
msgstr ""
9983
9984
#: en/help_topics/configuration.txt:482
9985
msgid ""
9986
"true\n"
9987
" (default) This section applies to subdirectories as well."
9988
msgstr ""
9989
9990
#: en/help_topics/configuration.txt:485
9991
msgid ""
9992
"false\n"
9993
" This section only applies to the branch at this directory and not\n"
9994
" branches below it."
9995
msgstr ""
9996
9997
#: en/help_topics/configuration.txt:489
9998
msgid ""
9999
"gpg_signing_command\n"
10000
"~~~~~~~~~~~~~~~~~~~"
10001
msgstr ""
10002
10003
#: en/help_topics/configuration.txt:492
10004
msgid ""
10005
"(Default: \"gpg\"). Which program should be used to sign and check "
10006
"revisions.\n"
10007
"For example::"
10008
msgstr ""
10009
10010
#: en/help_topics/configuration.txt:495
10011
msgid " gpg_signing_command = /usr/bin/gnpg"
10012
msgstr ""
10013
10014
#: en/help_topics/configuration.txt:497
10015
msgid ""
10016
"The specified command must accept the options \"--clearsign\" and \"-u "
10017
"<email>\"."
10018
msgstr ""
10019
10020
#: en/help_topics/configuration.txt:499
10021
msgid ""
10022
"bzr_remote_path\n"
10023
"~~~~~~~~~~~~~~~"
10024
msgstr ""
10025
10026
#: en/help_topics/configuration.txt:502
10027
msgid ""
10028
"(Default: \"bzr\"). The path to the command that should be used to run the "
10029
"smart\n"
10030
"server for bzr. This value may only be specified in locations.conf, because:"
10031
msgstr ""
10032
10033
#: en/help_topics/configuration.txt:505
10034
msgid ""
10035
"- it's needed before branch.conf is accessible\n"
10036
"- allowing remote branch.conf files to specify commands would be a security\n"
10037
" risk"
10038
msgstr ""
10039
10040
#: en/help_topics/configuration.txt:509
10041
msgid "It is overridden by the BZR_REMOTE_PATH environment variable."
10042
msgstr ""
10043
10044
#: en/help_topics/configuration.txt:511
10045
msgid ""
10046
"smtp_server\n"
10047
"~~~~~~~~~~~"
10048
msgstr ""
10049
10050
#: en/help_topics/configuration.txt:514
10051
msgid ""
10052
"(Default: \"localhost\"). SMTP server to use when Bazaar needs to send\n"
10053
"email, eg. with ``merge-directive --mail-to``, or the bzr-email plugin."
10054
msgstr ""
10055
10056
#: en/help_topics/configuration.txt:517
10057
msgid ""
10058
"smtp_username, smtp_password\n"
10059
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
10060
msgstr ""
10061
10062
#: en/help_topics/configuration.txt:520
10063
msgid ""
10064
"User and password to authenticate to the SMTP server. If smtp_username\n"
10065
"is set, and smtp_password is not, Bazaar will prompt for a password.\n"
10066
"These settings are only needed if the SMTP server requires authentication\n"
10067
"to send mail."
10068
msgstr ""
10069
10070
#: en/help_topics/configuration.txt:525
10071
msgid ""
10072
"locks.steal_dead\n"
10073
"~~~~~~~~~~~~~~~~"
10074
msgstr ""
10075
10076
#: en/help_topics/configuration.txt:528
10077
msgid ""
10078
"If set to true, bzr will automatically break locks held by processes from\n"
10079
"the same machine and user that are no longer alive. Otherwise, it will\n"
10080
"print a message and you can break the lock manually, if you are satisfied\n"
10081
"the object is no longer in use."
10082
msgstr ""
10083
10084
#: en/help_topics/configuration.txt:533
10085
msgid ""
10086
"mail_client\n"
10087
"~~~~~~~~~~~"
10088
msgstr ""
10089
10090
#: en/help_topics/configuration.txt:536
10091
msgid ""
10092
"A mail client to use for sending merge requests.\n"
10093
"By default, bzr will try to use ``mapi`` on Windows. On other platforms, "
10094
"it\n"
10095
"will try ``xdg-email``. If either of these fails, it will fall back to\n"
10096
"``editor``."
10097
msgstr ""
10098
10099
#: en/help_topics/configuration.txt:541
10100
msgid "Supported values for specific clients:"
10101
msgstr ""
10102
10103
#: en/help_topics/configuration.txt:543
10104
msgid ""
10105
":claws: Use Claws. This skips a dialog for attaching files.\n"
10106
":evolution: Use Evolution.\n"
10107
":kmail: Use KMail.\n"
10108
":mutt: Use Mutt.\n"
10109
":thunderbird: Use Mozilla Thunderbird or Icedove. For Thunderbird/Icedove "
10110
"1.5,\n"
10111
" this works around some bugs that xdg-email doesn't handle."
10112
msgstr ""
10113
10114
#: en/help_topics/configuration.txt:550
10115
msgid "Supported generic values are:"
10116
msgstr ""
10117
10118
#: en/help_topics/configuration.txt:552
10119
msgid ""
10120
":default: See above.\n"
10121
":editor: Use your editor to compose the merge request. This also uses\n"
10122
" your commit id, (see ``bzr whoami``), smtp_server and (optionally)\n"
10123
" smtp_username and smtp_password.\n"
10124
":mapi: Use your preferred e-mail client on Windows.\n"
10125
":xdg-email: Use xdg-email to run your preferred mail program"
10126
msgstr ""
10127
10128
#: en/help_topics/configuration.txt:559
10129
msgid ""
10130
"repository.fdatasync\n"
10131
"~~~~~~~~~~~~~~~~~~~~"
10132
msgstr ""
10133
10134
#: en/help_topics/configuration.txt:562
10135
msgid ""
10136
"If true (default), repository changes are flushed through the OS buffers\n"
10137
"to physical disk. This is somewhat slower, but means data should not be\n"
10138
"lost if the machine crashes. See also dirstate.fdatasync."
10139
msgstr ""
10140
10141
#: en/help_topics/configuration.txt:566
10142
msgid ""
10143
"submit_branch\n"
10144
"~~~~~~~~~~~~~"
10145
msgstr ""
10146
10147
#: en/help_topics/configuration.txt:569
10148
msgid ""
10149
"The branch you intend to submit your current work to. This is "
10150
"automatically\n"
10151
"set by ``bzr send``, and is also used by the ``submit:`` revision spec. "
10152
"This\n"
10153
"should usually be set on a per-branch or per-location basis."
10154
msgstr ""
10155
10156
#: en/help_topics/configuration.txt:573
10157
msgid ""
10158
"public_branch\n"
10159
"~~~~~~~~~~~~~"
10160
msgstr ""
10161
10162
#: en/help_topics/configuration.txt:576
10163
msgid ""
10164
"A publically-accessible version of this branch (implying that this version "
10165
"is\n"
10166
"not publically-accessible). Used (and set) by ``bzr send``."
10167
msgstr ""
10168
10169
#: en/help_topics/configuration.txt:579
10170
msgid ""
10171
"suppress_warnings\n"
10172
"~~~~~~~~~~~~~~~~~"
10173
msgstr ""
10174
10175
#: en/help_topics/configuration.txt:582
10176
msgid ""
10177
"A list of strings, each string represent a warning that can be emitted by\n"
10178
"bzr. Mentioning a warning in this list tells bzr to not emit it."
10179
msgstr ""
10180
10181
#: en/help_topics/configuration.txt:585
10182
msgid "Valid values:"
10183
msgstr ""
10184
10185
#: en/help_topics/configuration.txt:587
10186
msgid ""
10187
"* ``format_deprecation``:\n"
10188
" whether the format deprecation warning is shown on repositories that "
10189
"are\n"
10190
" using deprecated formats."
10191
msgstr ""
10192
10193
#: en/help_topics/configuration.txt:591
10194
msgid ""
10195
"default_format\n"
10196
"~~~~~~~~~~~~~~"
10197
msgstr ""
10198
10199
#: en/help_topics/configuration.txt:594
10200
msgid ""
10201
"A format name for the default format used when creating branches. See "
10202
"``bzr\n"
10203
"help formats`` for possible values."
10204
msgstr ""
10205
10206
#: en/help_topics/configuration.txt:597
10207
msgid ""
10208
"\n"
10209
"Unicode options\n"
10210
"---------------"
10211
msgstr ""
10212
10213
#: en/help_topics/configuration.txt:601
10214
msgid ""
10215
"output_encoding\n"
10216
"~~~~~~~~~~~~~~~"
10217
msgstr ""
10218
10219
#: en/help_topics/configuration.txt:604
10220
msgid ""
10221
"A Python unicode encoding name for text output from bzr, such as log\n"
10222
"information. Values include: utf8, cp850, ascii, iso-8859-1. The default\n"
10223
"is the terminal encoding prefered by the operating system."
10224
msgstr ""
10225
10226
#: en/help_topics/configuration.txt:608
10227
msgid ""
10228
"\n"
10229
"Branch type specific options\n"
10230
"----------------------------"
10231
msgstr ""
10232
10233
#: en/help_topics/configuration.txt:612
10234
msgid ""
10235
"These options apply only to branches that use the ``dirstate-tags`` or\n"
10236
"later format. They\n"
10237
"are usually set in ``.bzr/branch/branch.conf`` automatically, but may be\n"
10238
"manually set in ``locations.conf`` or ``bazaar.conf``."
10239
msgstr ""
10240
10241
#: en/help_topics/configuration.txt:617
10242
msgid ""
10243
"append_revisions_only\n"
10244
"~~~~~~~~~~~~~~~~~~~~~"
10245
msgstr ""
10246
10247
#: en/help_topics/configuration.txt:620
10248
msgid ""
10249
"If set to \"True\" then revisions can only be appended to the log, not\n"
10250
"removed. A branch with this setting enabled can only pull from another\n"
10251
"branch if the other branch's log is a longer version of its own. This is\n"
10252
"normally set by ``bzr init --append-revisions-only``. If you set it\n"
10253
"manually, use either 'True' or 'False' (case-sensitive) to maintain\n"
10254
"compatibility with previous bzr versions (older than 2.2)."
10255
msgstr ""
10256
10257
#: en/help_topics/configuration.txt:627
10258
msgid ""
10259
"parent_location\n"
10260
"~~~~~~~~~~~~~~~"
10261
msgstr ""
10262
10263
#: en/help_topics/configuration.txt:630
10264
msgid ""
10265
"If present, the location of the default branch for pull or merge. This "
10266
"option\n"
10267
"is normally set when creating a branch, the first ``pull`` or by ``pull\n"
10268
"--remember``."
10269
msgstr ""
10270
10271
#: en/help_topics/configuration.txt:634
10272
msgid ""
10273
"push_location\n"
10274
"~~~~~~~~~~~~~"
10275
msgstr ""
10276
10277
#: en/help_topics/configuration.txt:637
10278
msgid ""
10279
"If present, the location of the default branch for push. This option\n"
10280
"is normally set by the first ``push`` or ``push --remember``."
10281
msgstr ""
10282
10283
#: en/help_topics/configuration.txt:640
10284
msgid ""
10285
"push_strict\n"
10286
"~~~~~~~~~~~"
10287
msgstr ""
10288
10289
#: en/help_topics/configuration.txt:643
10290
msgid ""
10291
"If present, defines the ``--strict`` option default value for checking\n"
10292
"uncommitted changes before pushing."
10293
msgstr ""
10294
10295
#: en/help_topics/configuration.txt:646
10296
msgid ""
10297
"dpush_strict\n"
10298
"~~~~~~~~~~~~"
10299
msgstr ""
10300
10301
#: en/help_topics/configuration.txt:649
10302
msgid ""
10303
"If present, defines the ``--strict`` option default value for checking\n"
10304
"uncommitted changes before pushing into a different VCS without any\n"
10305
"custom bzr metadata."
10306
msgstr ""
10307
10308
#: en/help_topics/configuration.txt:653
10309
msgid ""
10310
"bound_location\n"
10311
"~~~~~~~~~~~~~~"
10312
msgstr ""
10313
10314
#: en/help_topics/configuration.txt:656
10315
msgid ""
10316
"The location that commits should go to when acting as a checkout.\n"
10317
"This option is normally set by ``bind``."
10318
msgstr ""
10319
10320
#: en/help_topics/configuration.txt:659
10321
msgid ""
10322
"bound\n"
10323
"~~~~~"
10324
msgstr ""
10325
10326
#: en/help_topics/configuration.txt:662
10327
msgid ""
10328
"If set to \"True\", the branch should act as a checkout, and push each "
10329
"commit to\n"
10330
"the bound_location. This option is normally set by ``bind``/``unbind``."
10331
msgstr ""
10332
10333
#: en/help_topics/configuration.txt:665
10334
msgid ""
10335
"send_strict\n"
10336
"~~~~~~~~~~~"
10337
msgstr ""
10338
10339
#: en/help_topics/configuration.txt:668
10340
msgid ""
10341
"If present, defines the ``--strict`` option default value for checking\n"
10342
"uncommitted changes before sending a merge directive."
10343
msgstr ""
10344
10345
#: en/help_topics/configuration.txt:671
10346
msgid ""
10347
"add.maximum_file_size\n"
10348
"~~~~~~~~~~~~~~~~~~~~~"
10349
msgstr ""
10350
10351
#: en/help_topics/configuration.txt:674
10352
msgid ""
10353
"Defines the maximum file size the command line \"add\" operation will allow\n"
10354
"in recursive mode, with files larger than this value being skipped. You may "
10355
"\n"
10356
"specify this value as an integer (in which case it is interpreted as bytes), "
10357
"\n"
10358
"or you may specify the value using SI units, i.e. 10KB, 20MB, 1G. A value of "
10359
"0 \n"
10360
"will disable skipping."
10361
msgstr ""
10362
10363
#: en/help_topics/configuration.txt:680
10364
msgid ""
10365
"External Merge Tools\n"
10366
"--------------------"
10367
msgstr ""
10368
10369
#: en/help_topics/configuration.txt:683
10370
msgid ""
10371
"bzr.mergetool.<name>\n"
10372
"~~~~~~~~~~~~~~~~~~~~"
10373
msgstr ""
10374
10375
#: en/help_topics/configuration.txt:686
10376
msgid ""
10377
"Defines an external merge tool called <name> with the given command-line.\n"
10378
"Arguments containing spaces should be quoted using single or double quotes. "
10379
"The\n"
10380
"executable may omit its path if it can be found on the PATH."
10381
msgstr ""
10382
10383
#: en/help_topics/configuration.txt:690
10384
msgid ""
10385
"The following markers can be used in the command-line to substitute "
10386
"filenames\n"
10387
"involved in the merge conflict::"
10388
msgstr ""
10389
10390
#: en/help_topics/configuration.txt:693
10391
msgid ""
10392
" {base} file.BASE\n"
10393
" {this} file.THIS\n"
10394
" {other} file.OTHER\n"
10395
" {result} output file\n"
10396
" {this_temp} temp copy of file.THIS, used to overwrite output file if "
10397
"merge\n"
10398
" succeeds."
10399
msgstr ""
10400
10401
#: en/help_topics/configuration.txt:702
10402
msgid " bzr.mergetool.kdiff3 = kdiff3 {base} {this} {other} -o {result}"
10403
msgstr ""
10404
10405
#: en/help_topics/configuration.txt:704
10406
msgid ""
10407
"bzr.default_mergetool\n"
10408
"~~~~~~~~~~~~~~~~~~~~~"
10409
msgstr ""
10410
10411
#: en/help_topics/configuration.txt:707
10412
msgid ""
10413
"Specifies which external merge tool (as defined above) should be selected "
10414
"by\n"
10415
"default in tools such as ``bzr qconflicts``."
10416
msgstr ""
10417
10418
#: en/help_topics/configuration.txt:712
10419
msgid " bzr.default_mergetool = kdiff3\n"
10420
msgstr ""
10421
10422
#: en/help_topics/conflict-types.txt:1
10423
msgid ""
10424
"Conflict Types\n"
10425
"=============="
10426
msgstr ""
10427
10428
#: en/help_topics/conflict-types.txt:4
10429
msgid ""
10430
"Some operations, like merge, revert and pull, modify the contents of your\n"
10431
"working tree. These modifications are programmatically generated, and so "
10432
"they\n"
10433
"may conflict with the current state of your working tree. "
10434
msgstr ""
10435
10436
#: en/help_topics/conflict-types.txt:8
10437
msgid ""
10438
"When conflicts are present in your working tree (as shown by ``bzr\n"
10439
"conflicts``), you should resolve them and then inform bzr that the "
10440
"conflicts\n"
10441
"have been resolved."
10442
msgstr ""
10443
10444
#: en/help_topics/conflict-types.txt:12
10445
msgid ""
10446
"Resolving conflicts is sometimes not obvious. Either because the user that\n"
10447
"should resolve them is not the one responsible for their occurrence, as is "
10448
"the\n"
10449
"case when merging other people's work or because some conflicts are "
10450
"presented\n"
10451
"in a way that is not easy to understand."
10452
msgstr ""
10453
10454
#: en/help_topics/conflict-types.txt:17
10455
msgid ""
10456
"Bazaar tries to avoid conflicts ; its aim is to ask you to resolve the\n"
10457
"conflict if and only if there's an actual conceptual conflict in the source\n"
10458
"tree. Because Bazaar doesn't understand the real meaning of the files "
10459
"being\n"
10460
"versioned, it can, when faced with ambiguities, fall short in either "
10461
"direction\n"
10462
"trying to resolve the conflict itself. Many kinds of changes can be "
10463
"combined\n"
10464
"programmatically, but sometimes only a human can determine the right thing "
10465
"to\n"
10466
"do."
10467
msgstr ""
10468
10469
#: en/help_topics/conflict-types.txt:25
10470
msgid ""
10471
"When Bazaar generates a conflict, it adds information into the working tree "
10472
"to\n"
10473
"present the conflicting versions, and it's up to you to find the correct\n"
10474
"resolution."
10475
msgstr ""
10476
10477
#: en/help_topics/conflict-types.txt:29
10478
msgid "Whatever the conflict is, resolving it is roughly done in two steps:"
10479
msgstr ""
10480
10481
#: en/help_topics/conflict-types.txt:31
10482
msgid ""
10483
"1. Modify the working tree content so that the conflicted item is now in "
10484
"the\n"
10485
" state you want to keep, then"
10486
msgstr ""
10487
10488
#: en/help_topics/conflict-types.txt:34
10489
msgid ""
10490
"2. Inform Bazaar that the conflict is now solved and ask to cleanup any\n"
10491
" remaining generated information (``bzr resolve <item>``)."
10492
msgstr ""
10493
10494
#: en/help_topics/conflict-types.txt:37
10495
msgid ""
10496
"For most conflict types, there are some obvious ways to modify the working\n"
10497
"tree and put it into the desired state. For some types of conflicts, Bazaar\n"
10498
"itself already made a choice, when possible."
10499
msgstr ""
10500
10501
#: en/help_topics/conflict-types.txt:41
10502
msgid ""
10503
"Yet, whether Bazaar makes a choice or not, there are some other simple but\n"
10504
"different ways to resolve the conflict."
10505
msgstr ""
10506
10507
#: en/help_topics/conflict-types.txt:44
10508
msgid ""
10509
"Each type of conflict is explained below, and the action which must be done "
10510
"to\n"
10511
"resolve the conflict is outlined."
10512
msgstr ""
10513
10514
#: en/help_topics/conflict-types.txt:47
10515
msgid ""
10516
"Various actions are available depending on the kind of conflict, for some "
10517
"of\n"
10518
"these actions, Bazaar can provide some help. In the end you should at least\n"
10519
"inform Bazaar that you're done with the conflict with::"
10520
msgstr ""
10521
10522
#: en/help_topics/conflict-types.txt:51
10523
msgid " ``bzr resolve FILE --action=done'"
10524
msgstr ""
10525
10526
#: en/help_topics/conflict-types.txt:53
10527
msgid ""
10528
"Note that this is the default action when a single file is involved so you "
10529
"can\n"
10530
"simply use::"
10531
msgstr ""
10532
10533
#: en/help_topics/conflict-types.txt:56
10534
msgid " ``bzr resolve FILE``"
10535
msgstr ""
10536
10537
#: en/help_topics/conflict-types.txt:58
10538
msgid "See ``bzr help resolve`` for more details."
10539
msgstr ""
10540
10541
#: en/help_topics/conflict-types.txt:60
10542
msgid ""
10543
"Text conflicts\n"
10544
"--------------"
10545
msgstr ""
10546
10547
#: en/help_topics/conflict-types.txt:63 en/help_topics/conflict-types.txt:120
10548
#: en/help_topics/conflict-types.txt:151 en/help_topics/conflict-types.txt:175
10549
#: en/help_topics/conflict-types.txt:198 en/help_topics/conflict-types.txt:213
10550
#: en/help_topics/conflict-types.txt:239 en/help_topics/conflict-types.txt:281
10551
#: en/help_topics/conflict-types.txt:303 en/help_topics/conflict-types.txt:339
10552
msgid "Typical message::"
10553
msgstr ""
10554
10555
#: en/help_topics/conflict-types.txt:65
10556
msgid " Text conflict in FILE"
10557
msgstr ""
10558
10559
#: en/help_topics/conflict-types.txt:67
10560
msgid ""
10561
"These are produced when a text merge cannot completely reconcile two sets "
10562
"of\n"
10563
"text changes. Bazaar will emit files for each version with the extensions\n"
10564
"THIS, OTHER, and BASE. THIS is the version of the file from the target "
10565
"tree,\n"
10566
"i.e. the tree that you are merging changes into. OTHER is the version that "
10567
"you\n"
10568
"are merging into the target. BASE is an older version that is used as a "
10569
"basis\n"
10570
"for comparison."
10571
msgstr ""
10572
10573
#: en/help_topics/conflict-types.txt:74
10574
msgid ""
10575
"In the main copy of the file, Bazaar will include all the changes that it\n"
10576
"could reconcile, and any un-reconciled conflicts are surrounded by\n"
10577
"\"herringbone\" markers like ``<<<<<<<``."
10578
msgstr ""
10579
10580
#: en/help_topics/conflict-types.txt:78
10581
msgid ""
10582
"Say the initial text is \"The project leader released it.\", and THIS "
10583
"modifies it\n"
10584
"to \"Martin Pool released it.\", while OTHER modifies it to \"The project "
10585
"leader\n"
10586
"released Bazaar.\" A conflict would look like this::"
10587
msgstr ""
10588
10589
#: en/help_topics/conflict-types.txt:82
10590
msgid ""
10591
" <<<<<<< TREE\n"
10592
" Martin Pool released it.\n"
10593
" =======\n"
10594
" The project leader released Bazaar.\n"
10595
" >>>>>>> MERGE-SOURCE"
10596
msgstr ""
10597
10598
#: en/help_topics/conflict-types.txt:88
10599
msgid "The correct resolution would be \"Martin Pool released Bazaar.\""
10600
msgstr ""
10601
10602
#: en/help_topics/conflict-types.txt:90
10603
msgid ""
10604
"You can handle text conflicts either by editing the main copy of the file,\n"
10605
"or by invoking external tools on the THIS, OTHER and BASE versions. It's\n"
10606
"worth mentioning that resolving text conflicts rarely involves picking one\n"
10607
"set of changes over the other (but see below when you encounter these\n"
10608
"cases). More often, the two sets of changes must be intelligently combined."
10609
msgstr ""
10610
10611
#: en/help_topics/conflict-types.txt:96
10612
msgid ""
10613
"If you edit the main copy, be sure to remove the herringbone markers. When\n"
10614
"you are done editing, the file should look like it never had a conflict, and "
10615
"be\n"
10616
"ready to commit."
10617
msgstr ""
10618
10619
#: en/help_topics/conflict-types.txt:100
10620
msgid ""
10621
"When you have resolved text conflicts, just run ``bzr resolve --auto``, and\n"
10622
"Bazaar will auto-detect which conflicts you have resolved."
10623
msgstr ""
10624
10625
#: en/help_topics/conflict-types.txt:103
10626
msgid ""
10627
"When the conflict is resolved, Bazaar deletes the previously generated\n"
10628
"``.BASE``, ``.THIS`` and ``.OTHER`` files if they are still present in the\n"
10629
"working tree."
10630
msgstr ""
10631
10632
#: en/help_topics/conflict-types.txt:107
10633
msgid ""
10634
"\n"
10635
"When you want to pick one set of changes over the other, you can use ``bzr\n"
10636
"resolve`` with one of the following actions:"
10637
msgstr ""
10638
10639
#: en/help_topics/conflict-types.txt:111
10640
msgid ""
10641
"* ``--action=take-this`` will issue ``mv FILE.THIS FILE``,\n"
10642
"* ``--action=take-other`` will issue ``mv FILE.OTHER FILE``."
10643
msgstr ""
10644
10645
#: en/help_topics/conflict-types.txt:114
10646
msgid ""
10647
"Note that if you have modified ``FILE.THIS`` or ``FILE.OTHER``, these\n"
10648
"modifications will be taken into account."
10649
msgstr ""
10650
10651
#: en/help_topics/conflict-types.txt:117
10652
msgid ""
10653
"Content conflicts\n"
10654
"-----------------"
10655
msgstr ""
10656
10657
#: en/help_topics/conflict-types.txt:122
10658
msgid " Contents conflict in FILE"
10659
msgstr ""
10660
10661
#: en/help_topics/conflict-types.txt:124
10662
msgid ""
10663
"This conflict happens when there are conflicting changes in the working "
10664
"tree\n"
10665
"and the merge source, but the conflicted items are not text files. They "
10666
"may\n"
10667
"be binary files, or symlinks, or directories. It can even happen with "
10668
"files\n"
10669
"that are deleted on one side, and modified on the other."
10670
msgstr ""
10671
10672
#: en/help_topics/conflict-types.txt:129
10673
msgid ""
10674
"Like text conflicts, Bazaar will emit THIS, OTHER and BASE files. (They may "
10675
"be\n"
10676
"regular files, symlinks or directories). But it will not include a \"main "
10677
"copy\"\n"
10678
"of the file with herringbone conflict markers. It will appear that the "
10679
"\"main\n"
10680
"copy\" has been renamed to THIS or OTHER."
10681
msgstr ""
10682
10683
#: en/help_topics/conflict-types.txt:134 en/help_topics/conflict-types.txt:182
10684
msgid ""
10685
"To resolve that kind of conflict, you should rebuild FILE from either "
10686
"version\n"
10687
"or a combination of both."
10688
msgstr ""
10689
10690
#: en/help_topics/conflict-types.txt:137 en/help_topics/conflict-types.txt:185
10691
#: en/help_topics/conflict-types.txt:226 en/help_topics/conflict-types.txt:252
10692
#: en/help_topics/conflict-types.txt:291 en/help_topics/conflict-types.txt:326
10693
#: en/help_topics/conflict-types.txt:361
10694
msgid "``bzr resolve`` recognizes the following actions:"
10695
msgstr ""
10696
10697
#: en/help_topics/conflict-types.txt:139
10698
msgid ""
10699
"* ``--action=take-this`` will issue ``bzr mv FILE.THIS FILE``,\n"
10700
"* ``--action=take-other`` will issue ``bzr mv FILE.OTHER FILE``,\n"
10701
"* ``--action=done`` will just mark the conflict as resolved."
10702
msgstr ""
10703
10704
#: en/help_topics/conflict-types.txt:143
10705
msgid ""
10706
"Any action will also delete the previously generated ``.BASE``, ``.THIS`` "
10707
"and\n"
10708
"``.OTHER`` files if they are still present in the working tree."
10709
msgstr ""
10710
10711
#: en/help_topics/conflict-types.txt:146 en/help_topics/conflict-types.txt:193
10712
#: en/help_topics/conflict-types.txt:234 en/help_topics/conflict-types.txt:276
10713
#: en/help_topics/conflict-types.txt:298 en/help_topics/conflict-types.txt:334
10714
#: en/help_topics/conflict-types.txt:369
10715
msgid ""
10716
"Bazaar cannot auto-detect when conflicts of this kind have been resolved."
10717
msgstr ""
10718
10719
#: en/help_topics/conflict-types.txt:148
10720
msgid ""
10721
"Tag conflicts\n"
10722
"-------------"
10723
msgstr ""
10724
10725
#: en/help_topics/conflict-types.txt:153
10726
msgid ""
10727
" Conflicting tags:\n"
10728
" version-0.1"
10729
msgstr ""
10730
10731
#: en/help_topics/conflict-types.txt:156
10732
msgid ""
10733
"When pulling from or pushing to another branch, Bazaar informs you about "
10734
"tags\n"
10735
"that conflict between the two branches; that is the same tag points to two\n"
10736
"different revisions. You need not resolve these conflicts, but subsequent\n"
10737
"uses of pull or push will result in the same message."
10738
msgstr ""
10739
10740
#: en/help_topics/conflict-types.txt:161
10741
msgid ""
10742
"To resolve the conflict, you must apply the correct tags to either the "
10743
"target\n"
10744
"branch or the source branch as appropriate. Use \"bzr tags --show-ids -d\n"
10745
"SOURCE_URL\" to see the tags in the source branch. If you want to make the\n"
10746
"target branch's tags match the source branch, then in the target branch do\n"
10747
"``bzr tag --force -r revid:REVISION_ID CONFLICTING_TAG`` for each of the\n"
10748
"CONFLICTING_TAGs, where REVISION_ID comes from the list of tags in the "
10749
"source\n"
10750
"branch. You need not call \"bzr resolve\" after doing this. To resolve in\n"
10751
"favor of the target branch, you need to similarly use ``tag --force`` in "
10752
"the\n"
10753
"source branch. (Note that pulling or pushing using --overwrite will "
10754
"overwrite\n"
10755
"all tags as well.)"
10756
msgstr ""
10757
10758
#: en/help_topics/conflict-types.txt:172
10759
msgid ""
10760
"Duplicate paths\n"
10761
"---------------"
10762
msgstr ""
10763
10764
#: en/help_topics/conflict-types.txt:177
10765
msgid " Conflict adding file FILE. Moved existing file to FILE.moved."
10766
msgstr ""
10767
10768
#: en/help_topics/conflict-types.txt:179
10769
msgid ""
10770
"Sometimes Bazaar will attempt to create a file using a pathname that has\n"
10771
"already been used. The existing file will be renamed to \"FILE.moved\". "
10772
msgstr ""
10773
10774
#: en/help_topics/conflict-types.txt:187
10775
msgid ""
10776
"* ``--action=take-this`` will issue ``bzr rm FILE ; bzr mv FILE.moved "
10777
"FILE``,\n"
10778
"* ``--action=take-other`` will issue ``bzr rm FILE.moved``,\n"
10779
"* ``--action=done`` will just mark the conflict as resolved."
10780
msgstr ""
10781
10782
#: en/help_topics/conflict-types.txt:191
10783
msgid ""
10784
"Note that you must get rid of FILE.moved before using ``--action=done``."
10785
msgstr ""
10786
10787
#: en/help_topics/conflict-types.txt:195
10788
msgid ""
10789
"Unversioned parent\n"
10790
"------------------"
10791
msgstr ""
10792
10793
#: en/help_topics/conflict-types.txt:200
10794
msgid ""
10795
" Conflict because FILE is not versioned, but has versioned children."
10796
msgstr ""
10797
10798
#: en/help_topics/conflict-types.txt:202
10799
msgid ""
10800
"Sometimes Bazaar will attempt to create a file whose parent directory is "
10801
"not\n"
10802
"versioned. This happens when the directory has been deleted in the target,\n"
10803
"but has a new child in the source, or vice versa. In this situation, "
10804
"Bazaar\n"
10805
"will version the parent directory as well. Resolving this issue depends\n"
10806
"very much on the particular scenario. You may wish to rename or delete "
10807
"either\n"
10808
"the file or the directory. When you are satisfied, you can run \"bzr "
10809
"resolve\n"
10810
"FILE\" to mark the conflict as resolved."
10811
msgstr ""
10812
10813
#: en/help_topics/conflict-types.txt:210
10814
msgid ""
10815
"Missing parent\n"
10816
"--------------"
10817
msgstr ""
10818
10819
#: en/help_topics/conflict-types.txt:215
10820
msgid " Conflict adding files to FILE. Created directory."
10821
msgstr ""
10822
10823
#: en/help_topics/conflict-types.txt:217
10824
msgid ""
10825
"This happens when a directory has been deleted in the target, but has new\n"
10826
"children in the source. This is similar to the \"unversioned parent\" "
10827
"conflict,\n"
10828
"except that the parent directory does not *exist*, instead of just being\n"
10829
"unversioned. In this situation, Bazaar will create the missing parent.\n"
10830
"Resolving this issue depends very much on the particular scenario."
10831
msgstr ""
10832
10833
#: en/help_topics/conflict-types.txt:223 en/help_topics/conflict-types.txt:249
10834
msgid ""
10835
"To resolve that kind of conflict, you should either remove or rename the\n"
10836
"children or the directory or a combination of both."
10837
msgstr ""
10838
10839
#: en/help_topics/conflict-types.txt:228
10840
msgid ""
10841
"* ``--action=take-this`` will issue ``bzr rm directory`` including the\n"
10842
" children,\n"
10843
"* ``--action=take-other`` will acknowledge Bazaar choice to keep the "
10844
"children\n"
10845
" and restoring the directory,\n"
10846
"* ``--action=done`` will just mark the conflict as resolved."
10847
msgstr ""
10848
10849
#: en/help_topics/conflict-types.txt:236
10850
msgid ""
10851
"Deleting parent\n"
10852
"---------------"
10853
msgstr ""
10854
10855
#: en/help_topics/conflict-types.txt:241
10856
msgid " Conflict: can't delete DIR because it is not empty. Not deleting."
10857
msgstr ""
10858
10859
#: en/help_topics/conflict-types.txt:243
10860
msgid ""
10861
"This is the opposite of \"missing parent\". A directory is deleted in the\n"
10862
"source, but has new children in the target (either because a directory\n"
10863
"deletion is merged or because the merge introduce new children). Bazaar\n"
10864
"will retain the directory. Resolving this issue depends very much on the\n"
10865
"particular scenario."
10866
msgstr ""
10867
10868
#: en/help_topics/conflict-types.txt:254
10869
msgid ""
10870
"* ``--action=take-this`` will acknowledge Bazaar choice to keep the "
10871
"directory,"
10872
msgstr ""
10873
10874
#: en/help_topics/conflict-types.txt:256
10875
msgid ""
10876
"* ``--action=take-other`` will issue ``bzr rm directory`` including the \n"
10877
" children,"
10878
msgstr ""
10879
10880
#: en/help_topics/conflict-types.txt:259
10881
msgid "* ``--action=done`` will just mark the conflict as resolved."
10882
msgstr ""
10883
10884
#: en/help_topics/conflict-types.txt:261
10885
msgid ""
10886
"Note that when merging a directory deletion, if unversioned files are\n"
10887
"present, they become potential orphans has they don't have a directory\n"
10888
"parent anymore."
10889
msgstr ""
10890
10891
#: en/help_topics/conflict-types.txt:265
10892
msgid ""
10893
"Handling such orphans, *before* the conflict is created, is controlled by\n"
10894
"setting the ``bzr.transform.orphan_policy`` configuration option."
10895
msgstr ""
10896
10897
#: en/help_topics/conflict-types.txt:268
10898
msgid "There are two possible values for this option:"
10899
msgstr ""
10900
10901
#: en/help_topics/conflict-types.txt:270
10902
msgid ""
10903
"* ``conflict`` (the default): will leave the orphans in place and\n"
10904
" generate a conflicts,"
10905
msgstr ""
10906
10907
#: en/help_topics/conflict-types.txt:273
10908
msgid ""
10909
"* ``move``: will move the orphans to a ``bzr-orphans`` directory at the "
10910
"root\n"
10911
" of the working tree with names like ``<file>.~#~``."
10912
msgstr ""
10913
10914
#: en/help_topics/conflict-types.txt:278
10915
msgid ""
10916
"Path conflict\n"
10917
"-------------"
10918
msgstr ""
10919
10920
#: en/help_topics/conflict-types.txt:283
10921
msgid " Path conflict: PATH1 / PATH2"
10922
msgstr ""
10923
10924
#: en/help_topics/conflict-types.txt:285
10925
msgid ""
10926
"This happens when the source and target have each modified the name or "
10927
"parent\n"
10928
"directory of a file. Bazaar will use the path elements from the source."
10929
msgstr ""
10930
10931
#: en/help_topics/conflict-types.txt:288
10932
msgid ""
10933
"To resolve that kind of conflict, you just have to decide what name should "
10934
"be\n"
10935
"retained for the file involved."
10936
msgstr ""
10937
10938
#: en/help_topics/conflict-types.txt:293
10939
msgid ""
10940
"* ``--action=take-this`` will revert Bazaar choice and keep ``PATH1`` by\n"
10941
" issuing ``bzr mv PATH2 PATH1``,\n"
10942
"* ``--action=take-other`` will acknowledge Bazaar choice of keeping "
10943
"``PATH2``,\n"
10944
"* ``--action=done`` will just mark the conflict as resolved."
10945
msgstr ""
10946
10947
#: en/help_topics/conflict-types.txt:300
10948
msgid ""
10949
"Parent loop\n"
10950
"-----------"
10951
msgstr ""
10952
10953
#: en/help_topics/conflict-types.txt:305
10954
msgid " Conflict moving FILE into DIRECTORY. Cancelled move."
10955
msgstr ""
10956
10957
#: en/help_topics/conflict-types.txt:307
10958
msgid ""
10959
"This happens when the source and the target have each moved directories, so\n"
10960
"that, if the change could be applied, a directory would be contained by "
10961
"itself.\n"
10962
"For example::"
10963
msgstr ""
10964
10965
#: en/help_topics/conflict-types.txt:311
10966
msgid ""
10967
" $ bzr init\n"
10968
" $ bzr mkdir white\n"
10969
" $ bzr mkdir black\n"
10970
" $ bzr commit -m \"BASE\"\n"
10971
" $ bzr branch . ../other\n"
10972
" $ bzr mv white black\n"
10973
" $ bzr commit -m \"THIS\"\n"
10974
" $ bzr mv ../other/black ../other/white\n"
10975
" $ bzr commit ../other -m \"OTHER\"\n"
10976
" $ bzr merge ../other"
10977
msgstr ""
10978
10979
#: en/help_topics/conflict-types.txt:322
10980
msgid ""
10981
"In this situation, Bazaar will cancel the move, and leave ``white`` in\n"
10982
"``black``. To resolve that kind of conflict, you just have to decide what\n"
10983
"name should be retained for the directories involved."
10984
msgstr ""
10985
10986
#: en/help_topics/conflict-types.txt:328
10987
msgid ""
10988
"* ``--action=take-this`` will acknowledge Bazaar choice of leaving ``white`` "
10989
"\n"
10990
" in ``black``,\n"
10991
"* ``--action=take-other`` will revert Bazaar choice and move ``black`` in\n"
10992
" ``white`` by issuing ``bzr mv black/white white ; bzr mv black white``,\n"
10993
"* ``--action=done`` will just mark the conflict as resolved."
10994
msgstr ""
10995
10996
#: en/help_topics/conflict-types.txt:336
10997
msgid ""
10998
"Non-directory parent\n"
10999
"--------------------"
11000
msgstr ""
11001
11002
#: en/help_topics/conflict-types.txt:341
11003
msgid ""
11004
" Conflict: foo.new is not a directory, but has files in it.\n"
11005
" Created directory."
11006
msgstr ""
11007
11008
#: en/help_topics/conflict-types.txt:344
11009
msgid ""
11010
"This happens when one side has added files to a directory, and the other "
11011
"side\n"
11012
"has changed the directory into a file or symlink. For example::"
11013
msgstr ""
11014
11015
#: en/help_topics/conflict-types.txt:347
11016
msgid ""
11017
" $ bzr init\n"
11018
" $ bzr mkdir foo\n"
11019
" $ bzr commit -m \"BASE\"\n"
11020
" $ bzr branch . ../other\n"
11021
" $ rmdir foo\n"
11022
" $ touch foo\n"
11023
" $ bzr commit -m \"THIS\"\n"
11024
" $ bzr mkdir ../other/foo/bar\n"
11025
" $ bzr commit ../other -m \"OTHER\"\n"
11026
" $ bzr merge ../other"
11027
msgstr ""
11028
11029
#: en/help_topics/conflict-types.txt:358
11030
msgid ""
11031
"To resolve that kind of conflict, you have to decide what name should be\n"
11032
"retained for the file, directory or symlink involved."
11033
msgstr ""
11034
11035
#: en/help_topics/conflict-types.txt:363
11036
msgid ""
11037
"* ``--action=take-this`` will issue ``bzr rm --force foo.new`` and \n"
11038
" ``bzr add foo``,\n"
11039
"* ``--action=take-other`` will issue ``bzr rm --force foo`` and \n"
11040
" ``bzr mv foo.new foo``,\n"
11041
"* ``--action=done`` will just mark the conflict as resolved."
11042
msgstr ""
11043
11044
#: en/help_topics/conflict-types.txt:371
11045
msgid ""
11046
"MalformedTransform\n"
11047
"------------------"
11048
msgstr ""
11049
11050
#: en/help_topics/conflict-types.txt:374
11051
msgid ""
11052
"It is possible (though very rare) for Bazaar to raise a MalformedTransform\n"
11053
"exception. This means that Bazaar encountered a filesystem conflict that it "
11054
"was\n"
11055
"unable to resolve. This usually indicates a bug. Please let us know if "
11056
"you\n"
11057
"encounter this. Our bug tracker is at https://launchpad.net/bzr/+bugs\n"
11058
msgstr ""
11059
11060
#: en/help_topics/content-filters.txt:1
11061
msgid ""
11062
"Content Filters\n"
11063
"==============="
11064
msgstr ""
11065
11066
#: en/help_topics/content-filters.txt:4
11067
msgid ""
11068
"Content formats\n"
11069
"---------------"
11070
msgstr ""
11071
11072
#: en/help_topics/content-filters.txt:7
11073
msgid ""
11074
"Bazaar's content filtering allows you to store files in a different\n"
11075
"format from the copy in your working tree. This lets you, or your\n"
11076
"co-developers, use Windows development tools that expect CRLF files\n"
11077
"on projects that use other line-ending conventions. Among other things,\n"
11078
"content filters also let Unix developers more easily work on projects\n"
11079
"using Windows line-ending conventions, keyword expansion/compression,\n"
11080
"and trailing spaces on lines in text files to be implicitly stripped\n"
11081
"when committed."
11082
msgstr ""
11083
11084
#: en/help_topics/content-filters.txt:16
11085
msgid "To generalize, there are two content formats supported by Bazaar:"
11086
msgstr ""
11087
11088
#: en/help_topics/content-filters.txt:18
11089
msgid ""
11090
"* a canonical format - how files are stored internally\n"
11091
"* a convenience format - how files are created in a working tree."
11092
msgstr ""
11093
11094
#: en/help_topics/content-filters.txt:21
11095
msgid ""
11096
"\n"
11097
"Format conversion\n"
11098
"-----------------"
11099
msgstr ""
11100
11101
#: en/help_topics/content-filters.txt:25
11102
msgid ""
11103
"The conversion between these formats is done by content filters.\n"
11104
"A content filter has two parts:"
11105
msgstr ""
11106
11107
#: en/help_topics/content-filters.txt:28
11108
msgid ""
11109
"* a read converter - converts from convenience to canonical format\n"
11110
"* a write converter - converts from canonical to convenience format."
11111
msgstr ""
11112
11113
#: en/help_topics/content-filters.txt:31
11114
msgid ""
11115
"Many of these converters will provide *round-trip* conversion,\n"
11116
"i.e. applying the read converter followed by the write converter\n"
11117
"gives back the original content. However, others may provide an\n"
11118
"asymmetric conversion. For example, a read converter might strip\n"
11119
"trailing whitespace off lines in source code while the matching\n"
11120
"write converter might pass content through unchanged."
11121
msgstr ""
11122
11123
#: en/help_topics/content-filters.txt:38
11124
msgid ""
11125
"\n"
11126
"Enabling content filters\n"
11127
"------------------------"
11128
msgstr ""
11129
11130
#: en/help_topics/content-filters.txt:42
11131
msgid ""
11132
"Content filters are typically provided by plugins, so the first step\n"
11133
"in using them is to install the relevant plugins and read their\n"
11134
"documentation. Some plugins may be very specific about which files\n"
11135
"they filter, e.g. only files ending in ``.java`` or ``.php``.\n"
11136
"In other cases, the plugin may leave it in the user's hands to\n"
11137
"define which files are to be filtered. This is typically done\n"
11138
"using rule-based preferences. See ``bzr help rules`` for general\n"
11139
"information about defining these."
11140
msgstr ""
11141
11142
#: en/help_topics/content-filters.txt:51
11143
msgid ""
11144
"\n"
11145
"Impact on commands\n"
11146
"------------------"
11147
msgstr ""
11148
11149
#: en/help_topics/content-filters.txt:55
11150
msgid ""
11151
"Read converters are only applied to commands that read content from\n"
11152
"a working tree, e.g. status, diff and commit. For example, ``bzr diff``\n"
11153
"will apply read converters to files in the working tree, then compare\n"
11154
"the results to the content last committed."
11155
msgstr ""
11156
11157
#: en/help_topics/content-filters.txt:60
11158
msgid ""
11159
"Write converters are only applied by commands that **create files in a\n"
11160
"working tree**, e.g. branch, checkout, update. If you wish to see the\n"
11161
"canonical format of a file or tree, use ``bzr cat`` or ``bzr export``\n"
11162
"respectively."
11163
msgstr ""
11164
11165
#: en/help_topics/content-filters.txt:65
11166
msgid ""
11167
"Note: ``bzr commit`` does not implicitly apply write converters after\n"
11168
"comitting files. If this makes sense for a given plugin providing\n"
11169
"a content filter, the plugin can usually achieve this effect by using a\n"
11170
"``start_commit`` or ``post_commit`` hook say. See :doc:`hooks-help`\n"
11171
"for more information on hooks."
11172
msgstr ""
11173
11174
#: en/help_topics/content-filters.txt:71
11175
msgid ""
11176
"\n"
11177
"Refreshing your working tree\n"
11178
"----------------------------"
11179
msgstr ""
11180
11181
#: en/help_topics/content-filters.txt:75
11182
msgid ""
11183
"For performance reasons, Bazaar caches the timestamps of files in\n"
11184
"a working tree, and assumes files are unchanged if their timestamps\n"
11185
"match the cached values. As a consequence, there are times when\n"
11186
"you may need to explicitly ask for content filtering to be reapplied\n"
11187
"in one or both directions, e.g. after installing or reconfiguring\n"
11188
"plugins providing it."
11189
msgstr ""
11190
11191
#: en/help_topics/content-filters.txt:82
11192
msgid "Here are some general guidelines for doing this:"
11193
msgstr ""
11194
11195
#: en/help_topics/content-filters.txt:84
11196
msgid ""
11197
" * To reapply read converters, ``touch`` files, i.e. update their\n"
11198
" timestamp. Operations like ``bzr status`` should then reapply the\n"
11199
" relevant read converters and compare the end result with the\n"
11200
" canonical format."
11201
msgstr ""
11202
11203
#: en/help_topics/content-filters.txt:89
11204
msgid ""
11205
" * To reapply write converters, ensure there are no local changes,\n"
11206
" delete the relevant files and run ``bzr revert`` on those files."
11207
msgstr ""
11208
11209
#: en/help_topics/content-filters.txt:92
11210
msgid ""
11211
"Note: In the future, it is likely that additional options will be added\n"
11212
"to commands to make this refreshing process faster and safer.\n"
11213
msgstr ""
11214
11215
#: en/help_topics/current-formats.txt:1
11216
msgid "Current Storage Formats"
11217
msgstr ""
11218
11219
#: en/help_topics/current-formats.txt:3
11220
msgid ""
11221
":2a:\n"
11222
" (native) (default) Format for the bzr 2.0 series. Uses group-\n"
11223
" compress storage. Provides rich roots which are a one-way\n"
11224
" transition."
11225
msgstr ""
11226
11227
#: en/help_topics/current-formats.txt:8 en/help_topics/other-formats.txt:17
11228
msgid ""
11229
"\n"
11230
"See :doc:`formats-help` for more about storage formats."
11231
msgstr ""
11232
11233
#: en/help_topics/debug-flags.txt:1
11234
msgid ""
11235
"Debug Flags\n"
11236
"==========="
11237
msgstr ""
11238
11239
#: en/help_topics/debug-flags.txt:4
11240
msgid ""
11241
"These flags can be passed on the bzr command line or (without the ``-D``\n"
11242
"prefix) put in the ``debug_flags`` variable in ``bazaar.conf``."
11243
msgstr ""
11244
11245
#: en/help_topics/debug-flags.txt:7
11246
msgid ""
11247
"-Dauth Trace authentication sections used.\n"
11248
"-Dbytes Print out how many bytes were transferred\n"
11249
"-Ddirstate Trace dirstate activity (verbose!)\n"
11250
"-Derror Instead of normal error handling, always print a "
11251
"traceback\n"
11252
" on error.\n"
11253
"-Devil Capture call sites that do expensive or badly-scaling\n"
11254
" operations.\n"
11255
"-Dfetch Trace history copying between repositories.\n"
11256
"-Dfilters Emit information for debugging content filtering.\n"
11257
"-Dforceinvdeltas Force use of inventory deltas during generic streaming "
11258
"fetch.\n"
11259
"-Dgraph Trace graph traversal.\n"
11260
"-Dhashcache Log every time a working file is read to determine its "
11261
"hash.\n"
11262
"-Dhooks Trace hook execution.\n"
11263
"-Dhpss Trace smart protocol requests and responses.\n"
11264
"-Dhpssdetail More hpss details.\n"
11265
"-Dhpssvfs Traceback on vfs access to Remote objects.\n"
11266
"-Dhttp Trace http connections, requests and responses.\n"
11267
"-Dindex Trace major index operations.\n"
11268
"-Dknit Trace knit operations.\n"
11269
"-Dlock Trace when lockdir locks are taken or released.\n"
11270
"-Dnoretry If a connection is reset, fail immediately rather than\n"
11271
" retrying the request.\n"
11272
"-Dprogress Trace progress bar operations.\n"
11273
"-Dmem_dump Dump memory to a file upon an out of memory error.\n"
11274
"-Dmerge Emit information for debugging merges.\n"
11275
"-Dno_apport Don't use apport to report crashes.\n"
11276
"-Dno_activity \t Don't show transport activity indicator in progress bar.\n"
11277
"-Dpack Emit information about pack operations.\n"
11278
"-Drelock Emit a message every time a branch or repository object "
11279
"is\n"
11280
" unlocked then relocked the same way.\n"
11281
"-Dsftp Trace SFTP internals.\n"
11282
"-Dstatic_tuple Error when a tuple is used where a StaticTuple is "
11283
"expected\n"
11284
"-Dstream Trace fetch streams.\n"
11285
"-Dstrict_locks Trace when OS locks are potentially used in a non-"
11286
"portable\n"
11287
" manner.\n"
11288
"-Dunlock Some errors during unlock are treated as warnings.\n"
11289
"-DIDS_never Never use InterDifferingSerializer when fetching.\n"
11290
"-DIDS_always Always use InterDifferingSerializer to fetch if "
11291
"appropriate\n"
11292
" for the format, even for non-local fetches.\n"
11293
msgstr ""
11294
11295
#: en/help_topics/diverged-branches.txt:1
11296
msgid ""
11297
"Diverged Branches\n"
11298
"================="
11299
msgstr ""
11300
11301
#: en/help_topics/diverged-branches.txt:4
11302
msgid ""
11303
"When Bazaar tries to push one branch onto another, it requires that the\n"
11304
"destination branch must be ready to receive the source branch. If this "
11305
"isn't\n"
11306
"the case, then we say that the branches have ``diverged``. Branches are\n"
11307
"considered diverged if the destination branch's most recent commit is one "
11308
"that\n"
11309
"has not been merged (directly or indirectly) by the source branch. To "
11310
"recover\n"
11311
"from diverged branches, one must merge the missing revisions into the "
11312
"source\n"
11313
"branch."
11314
msgstr ""
11315
11316
#: en/help_topics/diverged-branches.txt:12
11317
msgid ""
11318
"This situation commonly arises when using a centralized workflow with local\n"
11319
"commits. If someone else has committed new work to the mainline since your\n"
11320
"last pull and you have local commits that have not yet been pushed to the\n"
11321
"mainline, then your local branch and the mainline have diverged."
11322
msgstr ""
11323
11324
#: en/help_topics/diverged-branches.txt:17
11325
msgid ""
11326
"Discovering What Has Diverged\n"
11327
"-----------------------------"
11328
msgstr ""
11329
11330
#: en/help_topics/diverged-branches.txt:20
11331
msgid ""
11332
"The ``bzr missing`` command is used to find out what revisions are in "
11333
"another\n"
11334
"branch that are not present in the current branch, and vice-versa. It shows "
11335
"a\n"
11336
"summary of which extra revisions exist in each branch. If you want to see "
11337
"the\n"
11338
"precise effects of those revisions, you can use ``bzr diff --"
11339
"old=other_branch``\n"
11340
"to show the differences between other_branch and your current branch."
11341
msgstr ""
11342
11343
#: en/help_topics/diverged-branches.txt:26
11344
msgid ""
11345
"A Solution\n"
11346
"----------"
11347
msgstr ""
11348
11349
#: en/help_topics/diverged-branches.txt:29
11350
msgid ""
11351
"The solution is to merge the revisions from the mainline into your local\n"
11352
"branch. To do so, use ``bzr merge`` to get the new revisions from the\n"
11353
"mainline. This merge may result in conflicts if the other developer's "
11354
"changes\n"
11355
"overlap with your changes. These conflicts should be resolved before\n"
11356
"continuing. After any conflicts have been resolved, or even if there were "
11357
"no\n"
11358
"conflicts, Bazaar requires that you explicitly commit these new revisions\n"
11359
"to your local branch. This requirement gives you an opportunity to test "
11360
"the\n"
11361
"resulting working tree for correctness, since the merged revisions could "
11362
"have\n"
11363
"made arbitrary changes. After testing, you should commit the merge using\n"
11364
"``bzr commit``. This clears up the diverged branches situation. Your "
11365
"local\n"
11366
"branch can now be pushed to the mainline.\n"
11367
msgstr ""
11368
11369
#: en/help_topics/eol.txt:1
11370
msgid ""
11371
"End of Line Conversion\n"
11372
"======================"
11373
msgstr ""
11374
11375
#: en/help_topics/eol.txt:4
11376
msgid ""
11377
"EOL conversion is provided as a content filter where Bazaar internally\n"
11378
"stores a canonical format but outputs a convenience format. See\n"
11379
"``bzr help content-filters`` for general information about using these."
11380
msgstr ""
11381
11382
#: en/help_topics/eol.txt:8
11383
msgid ""
11384
"Note: Content filtering is only supported in recently added formats,\n"
11385
"e.g. 1.14. Be sure that both the repository *and* the branch are\n"
11386
"in a recent format. (Just setting the format on the repository\n"
11387
"is not enough.) If content filtering does not appear to be working, use\n"
11388
"'bzr info -v' to confirm that the branch is using \"Working tree format 5\"\n"
11389
"or later."
11390
msgstr ""
11391
11392
#: en/help_topics/eol.txt:15
11393
msgid ""
11394
"EOL conversion needs to be enabled for selected file patterns using\n"
11395
"rules. See ``bzr help rules`` for general information on defining rules.\n"
11396
"Currently, rules are only supported in $BZR_HOME/.bazaar/rules (or\n"
11397
"%BZR_HOME%/bazaar/2.0/rules on Windows). Branch specific rules will be\n"
11398
"supported in a future verison of Bazaar."
11399
msgstr ""
11400
11401
#: en/help_topics/eol.txt:21
11402
msgid ""
11403
"To configure which files to filter, set ``eol`` to one of the values below.\n"
11404
"(If a value is not set, ``exact`` is the default.)"
11405
msgstr ""
11406
11407
#: en/help_topics/eol.txt:24
11408
msgid ""
11409
" ========== ===================================== ======================\n"
11410
" Value Checkout end-of-lines as Commit end-of-lines as\n"
11411
" ========== ===================================== ======================\n"
11412
" ``native`` ``crlf`` on Windows, ``lf`` otherwise ``lf``\n"
11413
" ---------- ------------------------------------- ----------------------\n"
11414
" ``lf`` ``lf`` ``lf``\n"
11415
" ---------- ------------------------------------- ----------------------\n"
11416
" ``crlf`` ``crlf`` ``lf``\n"
11417
" ---------- ------------------------------------- ----------------------\n"
11418
" ``exact`` No conversion Exactly as in file\n"
11419
" ========== ===================================== ======================"
11420
msgstr ""
11421
11422
#: en/help_topics/eol.txt:36
11423
msgid ""
11424
"Note: For safety reasons, no conversion is applied to any file where a null\n"
11425
"byte is detected in the file."
11426
msgstr ""
11427
11428
#: en/help_topics/eol.txt:39
11429
msgid ""
11430
"For users working on a cross-platform project, here is a suggested rule\n"
11431
"to use as a starting point::"
11432
msgstr ""
11433
11434
#: en/help_topics/eol.txt:42 en/help_topics/eol.txt:52
11435
#: en/help_topics/eol.txt:67 en/help_topics/eol.txt:82
11436
msgid ""
11437
" [name *]\n"
11438
" eol = native"
11439
msgstr ""
11440
11441
#: en/help_topics/eol.txt:45
11442
msgid ""
11443
"If you have binary files that do not contain a null byte though, be\n"
11444
"sure to add ``eol = exact`` rules for those as well. You can do this\n"
11445
"by giving more explicit patterns earlier in the rules file. For example::"
11446
msgstr ""
11447
11448
#: en/help_topics/eol.txt:49
11449
msgid ""
11450
" [name *.png]\n"
11451
" eol = exact"
11452
msgstr ""
11453
11454
#: en/help_topics/eol.txt:55
11455
msgid ""
11456
"If your working tree is on a network drive shared by users on different\n"
11457
"operating systems, you typically want to force certain conventions for\n"
11458
"certain files. In that way, if a file is created with the wrong line\n"
11459
"endings or line endings get mixed during editing, it gets committed\n"
11460
"correctly and gets checked out correctly. For example::"
11461
msgstr ""
11462
11463
#: en/help_topics/eol.txt:61
11464
msgid ""
11465
" [name *.bat]\n"
11466
" eol = crlf"
11467
msgstr ""
11468
11469
#: en/help_topics/eol.txt:64
11470
msgid ""
11471
" [name *.sh]\n"
11472
" eol = lf"
11473
msgstr ""
11474
11475
#: en/help_topics/eol.txt:70
11476
msgid ""
11477
"If you take the care to create files with their required endings, you can\n"
11478
"achieve *almost* the same thing by using ``eol = exact``. It is slightly\n"
11479
"safer to use ``lf`` and ``crlf`` though because edits accidentally\n"
11480
"introducing mixed line endings will be corrected during commit for files\n"
11481
"with those settings."
11482
msgstr ""
11483
11484
#: en/help_topics/eol.txt:76
11485
msgid ""
11486
"If you have sample test data that deliberately has text files with mixed\n"
11487
"newline conventions, you can ask for those to be left alone like this::"
11488
msgstr ""
11489
11490
#: en/help_topics/eol.txt:79
11491
msgid ""
11492
" [name test_data/]\n"
11493
" eol = exact"
11494
msgstr ""
11495
11496
#: en/help_topics/eol.txt:85
11497
msgid ""
11498
"Note that ``exact`` does not imply the file is binary but it does mean\n"
11499
"that no conversion of end-of-lines will be done. (Bazaar currently relies\n"
11500
"of content analysis to detect binary files for commands like ``diff``.\n"
11501
"In the future, a ``binary = true`` rule may be added but it is not\n"
11502
"supported yet.)"
11503
msgstr ""
11504
11505
#: en/help_topics/eol.txt:91
11506
msgid ""
11507
"If you have an existing repository with text files already stored using\n"
11508
"Windows newline conventions (``crlf``), then you may want to keep using "
11509
"that\n"
11510
"convention in the repository. Forcing certain files to this convention\n"
11511
"may also help users who do not have rules configured. To do this, set\n"
11512
"``eol`` to one of the values below."
11513
msgstr ""
11514
11515
#: en/help_topics/eol.txt:97
11516
msgid ""
11517
" ============================ ======================== "
11518
"======================\n"
11519
" Value Checkout end-of-lines as Commit end-of-lines "
11520
"as\n"
11521
" ============================ ======================== "
11522
"======================\n"
11523
" ``native-with-crlf-in-repo`` ``crlf`` on Windows, ``crlf``\n"
11524
" ``lf`` otherwise\n"
11525
" ---------------------------- ------------------------ ----------------------"
11526
"\n"
11527
" ``lf-with-crlf-in-repo`` ``lf`` ``crlf``\n"
11528
" ---------------------------- ------------------------ ----------------------"
11529
"\n"
11530
" ``crlf-with-crlf-in-repo`` ``crlf`` ``crlf``\n"
11531
" ============================ ======================== ======================"
11532
msgstr ""
11533
11534
#: en/help_topics/eol.txt:108
11535
msgid ""
11536
"For users working on an existing project that uses Windows newline\n"
11537
"conventions in their Bazaar repository, this rule is suggested as a\n"
11538
"starting point::"
11539
msgstr ""
11540
11541
#: en/help_topics/eol.txt:112
11542
msgid ""
11543
" [name *]\n"
11544
" eol = native-with-crlf-in-repo"
11545
msgstr ""
11546
11547
#: en/help_topics/eol.txt:115
11548
msgid ""
11549
"For new projects, it is recommended that end-of-lines be stored as ``lf``\n"
11550
"and that users stick to the basic settings, i.e. ``native``, ``lf``,\n"
11551
"``crlf`` and ``exact``."
11552
msgstr ""
11553
11554
#: en/help_topics/eol.txt:119
11555
msgid ""
11556
"Note: Bazaar's EOL conversion will convert the content of files but\n"
11557
"never reject files because a given line ending or mixed line endings\n"
11558
"are found. A precommit hook should be used if you wish to validate\n"
11559
"(and not just convert) content before committing.\n"
11560
msgstr ""
11561
11562
#: en/help_topics/hidden-commands.txt:1
11563
msgid ""
11564
"added List files added in working tree.\n"
11565
"ancestry List all revisions merged into this branch.\n"
11566
"assert-fail Test reporting of assertion failures\n"
11567
"bundle-info Output interesting stats about a bundle\n"
11568
"bundle-revisions Create a merge-directive for submitting changes.\n"
11569
"cat-revision Write out metadata for a revision.\n"
11570
"dump-btree Dump the contents of a btree index file to stdout.\n"
11571
"export-pot Export command helps and error messages in po format.\n"
11572
"file-id Print file_id of a particular file or directory.\n"
11573
"file-path Print path of file_ids to a file or directory.\n"
11574
"find-merge-base Find and print a base revision for merging two "
11575
"branches.\n"
11576
"hooks Show hooks.\n"
11577
"inventory Show inventory of the current working copy or a "
11578
"revision.\n"
11579
"local-time-offset Show the offset in seconds from GMT to local time.\n"
11580
"lookup-revision Lookup the revision-id from a revision-number\n"
11581
"merge-directive Generate a merge directive for auto-merge tools.\n"
11582
"modified List files modified in working tree.\n"
11583
"re-sign Create a digital signature for an existing revision.\n"
11584
"reference list, view and set branch locations for nested trees.\n"
11585
"relpath Show path of a file relative to root\n"
11586
"repair-workingtree Reset the working tree state file.\n"
11587
"revision-history Display the list of revision ids on a branch.\n"
11588
"revision-info Show revision number and revision id for a given "
11589
"revision\n"
11590
" identifier.\n"
11591
"rocks Statement of optimism.\n"
11592
"selftest Run internal test suite.\n"
11593
"shell-complete Show appropriate completions for context.\n"
11594
"test-script Run a shell-like test from a file.\n"
11595
"touching-revisions Return revision-ids which affected a particular file.\n"
11596
"unknowns List unknown files.\n"
11597
"wait-until-signalled Test helper for\n"
11598
" test_start_and_stop_bzr_subprocess_send_signal.\n"
11599
msgstr ""
11600
11601
#: en/help_topics/hooks.txt:1
11602
msgid ""
11603
"\n"
11604
"Hooks\n"
11605
"====="
11606
msgstr ""
11607
11608
#: en/help_topics/hooks.txt:5 en/help_topics/rules.txt:4
11609
msgid ""
11610
"Introduction\n"
11611
"------------"
11612
msgstr ""
11613
11614
#: en/help_topics/hooks.txt:8
11615
msgid "A hook of type *xxx* of class *yyy* needs to be registered using::"
11616
msgstr ""
11617
11618
#: en/help_topics/hooks.txt:10
11619
msgid " yyy.hooks.install_named_hook(\"xxx\", ...)"
11620
msgstr ""
11621
11622
#: en/help_topics/hooks.txt:12
11623
msgid ""
11624
"See :doc:`Using hooks<../user-guide/hooks>` in the User Guide for examples."
11625
msgstr ""
11626
11627
#: en/help_topics/hooks.txt:14
11628
msgid ""
11629
"The class that contains each hook is given before the hooks it supplies. "
11630
"For\n"
11631
"instance, BranchHooks as the class is the hooks class for\n"
11632
"`bzrlib.branch.Branch.hooks`."
11633
msgstr ""
11634
11635
#: en/help_topics/hooks.txt:18
11636
msgid ""
11637
"Each description also indicates whether the hook runs on the client (the\n"
11638
"machine where bzr was invoked) or the server (the machine addressed by\n"
11639
"the branch URL). These may be, but are not necessarily, the same machine."
11640
msgstr ""
11641
11642
#: en/help_topics/hooks.txt:22
11643
msgid ""
11644
"Plugins (including hooks) are run on the server if all of these is true:"
11645
msgstr ""
11646
11647
#: en/help_topics/hooks.txt:24
11648
msgid ""
11649
" * The connection is via a smart server (accessed with a URL starting with\n"
11650
" \"bzr://\", \"bzr+ssh://\" or \"bzr+http://\", or accessed via a "
11651
"\"http://\"\n"
11652
" URL when a smart server is available via HTTP)."
11653
msgstr ""
11654
11655
#: en/help_topics/hooks.txt:28
11656
msgid ""
11657
" * The hook is either server specific or part of general infrastructure "
11658
"rather\n"
11659
" than client specific code (such as commit)."
11660
msgstr ""
11661
11662
#: en/help_topics/hooks.txt:31
11663
msgid ""
11664
"\n"
11665
"BranchHooks\n"
11666
"-----------"
11667
msgstr ""
11668
11669
#: en/help_topics/hooks.txt:35
11670
msgid ""
11671
"automatic_tag_name\n"
11672
"~~~~~~~~~~~~~~~~~~"
11673
msgstr ""
11674
11675
#: en/help_topics/hooks.txt:38 en/help_topics/hooks.txt:56
11676
#: en/help_topics/hooks.txt:102 en/help_topics/hooks.txt:259
11677
msgid "Introduced in: 2.2"
11678
msgstr ""
11679
11680
#: en/help_topics/hooks.txt:40
11681
msgid ""
11682
"Called to determine an automatic tag name for a revision.\n"
11683
"automatic_tag_name is called with (branch, revision_id) and should\n"
11684
"return a tag name or None if no tag name could be determined. The\n"
11685
"first non-None tag name returned will be used."
11686
msgstr ""
11687
11688
#: en/help_topics/hooks.txt:45
11689
msgid ""
11690
"open\n"
11691
"~~~~"
11692
msgstr ""
11693
11694
#: en/help_topics/hooks.txt:48 en/help_topics/hooks.txt:290
11695
#: en/help_topics/hooks.txt:304
11696
msgid "Introduced in: 1.8"
11697
msgstr ""
11698
11699
#: en/help_topics/hooks.txt:50
11700
msgid ""
11701
"Called with the Branch object that has been opened after a branch is\n"
11702
"opened."
11703
msgstr ""
11704
11705
#: en/help_topics/hooks.txt:53
11706
msgid ""
11707
"post_branch_init\n"
11708
"~~~~~~~~~~~~~~~~"
11709
msgstr ""
11710
11711
#: en/help_topics/hooks.txt:58
11712
msgid ""
11713
"Called after new branch initialization completes. post_branch_init is\n"
11714
"called with a bzrlib.branch.BranchInitHookParams. Note that init,\n"
11715
"branch and checkout (both heavyweight and lightweight) will all\n"
11716
"trigger this hook."
11717
msgstr ""
11718
11719
#: en/help_topics/hooks.txt:63
11720
msgid ""
11721
"post_change_branch_tip\n"
11722
"~~~~~~~~~~~~~~~~~~~~~~"
11723
msgstr ""
11724
11725
#: en/help_topics/hooks.txt:66 en/help_topics/hooks.txt:402
11726
msgid "Introduced in: 1.4"
11727
msgstr ""
11728
11729
#: en/help_topics/hooks.txt:68
11730
msgid ""
11731
"Called in bzr client and server after a change to the tip of a branch\n"
11732
"is made. post_change_branch_tip is called with a\n"
11733
"bzrlib.branch.ChangeBranchTipParams. Note that push, pull, commit,\n"
11734
"uncommit will all trigger this hook."
11735
msgstr ""
11736
11737
#: en/help_topics/hooks.txt:73 en/help_topics/hooks.txt:389
11738
msgid ""
11739
"post_commit\n"
11740
"~~~~~~~~~~~"
11741
msgstr ""
11742
11743
#: en/help_topics/hooks.txt:76 en/help_topics/hooks.txt:86
11744
#: en/help_topics/hooks.txt:94 en/help_topics/hooks.txt:110
11745
#: en/help_topics/hooks.txt:145
11746
msgid "Introduced in: 0.15"
11747
msgstr ""
11748
11749
#: en/help_topics/hooks.txt:78
11750
msgid ""
11751
"Called in the bzr client after a commit has completed. post_commit is\n"
11752
"called with (local, master, old_revno, old_revid, new_revno,\n"
11753
"new_revid). old_revid is NULL_REVISION for the first commit to a\n"
11754
"branch."
11755
msgstr ""
11756
11757
#: en/help_topics/hooks.txt:83
11758
msgid ""
11759
"post_pull\n"
11760
"~~~~~~~~~"
11761
msgstr ""
11762
11763
#: en/help_topics/hooks.txt:88
11764
msgid ""
11765
"Called after a pull operation completes. post_pull is called with a\n"
11766
"bzrlib.branch.PullResult object and only runs in the bzr client."
11767
msgstr ""
11768
11769
#: en/help_topics/hooks.txt:91
11770
msgid ""
11771
"post_push\n"
11772
"~~~~~~~~~"
11773
msgstr ""
11774
11775
#: en/help_topics/hooks.txt:96
11776
msgid ""
11777
"Called after a push operation completes. post_push is called with a\n"
11778
"bzrlib.branch.BranchPushResult object and only runs in the bzr client."
11779
msgstr ""
11780
11781
#: en/help_topics/hooks.txt:99
11782
msgid ""
11783
"post_switch\n"
11784
"~~~~~~~~~~~"
11785
msgstr ""
11786
11787
#: en/help_topics/hooks.txt:104
11788
msgid ""
11789
"Called after a checkout switches branch. post_switch is called with a\n"
11790
"bzrlib.branch.SwitchHookParams."
11791
msgstr ""
11792
11793
#: en/help_topics/hooks.txt:107
11794
msgid ""
11795
"post_uncommit\n"
11796
"~~~~~~~~~~~~~"
11797
msgstr ""
11798
11799
#: en/help_topics/hooks.txt:112
11800
msgid ""
11801
"Called in the bzr client after an uncommit completes. post_uncommit is\n"
11802
"called with (local, master, old_revno, old_revid, new_revno,\n"
11803
"new_revid) where local is the local branch or None, master is the\n"
11804
"target branch, and an empty branch receives new_revno of 0, new_revid\n"
11805
"of None."
11806
msgstr ""
11807
11808
#: en/help_topics/hooks.txt:118
11809
msgid ""
11810
"pre_change_branch_tip\n"
11811
"~~~~~~~~~~~~~~~~~~~~~"
11812
msgstr ""
11813
11814
#: en/help_topics/hooks.txt:121
11815
msgid "Introduced in: 1.6"
11816
msgstr ""
11817
11818
#: en/help_topics/hooks.txt:123
11819
msgid ""
11820
"Called in bzr client and server before a change to the tip of a branch\n"
11821
"is made. pre_change_branch_tip is called with a\n"
11822
"bzrlib.branch.ChangeBranchTipParams. Note that push, pull, commit,\n"
11823
"uncommit will all trigger this hook."
11824
msgstr ""
11825
11826
#: en/help_topics/hooks.txt:128
11827
msgid ""
11828
"pre_commit\n"
11829
"~~~~~~~~~~"
11830
msgstr ""
11831
11832
#: en/help_topics/hooks.txt:131
11833
msgid "Introduced in: 0.91"
11834
msgstr ""
11835
11836
#: en/help_topics/hooks.txt:133
11837
msgid ""
11838
"Called after a commit is calculated but before it is completed.\n"
11839
"pre_commit is called with (local, master, old_revno, old_revid,\n"
11840
"future_revno, future_revid, tree_delta, future_tree). old_revid is\n"
11841
"NULL_REVISION for the first commit to a branch, tree_delta is a\n"
11842
"TreeDelta object describing changes from the basis revision. hooks\n"
11843
"MUST NOT modify this delta. future_tree is an in-memory tree obtained\n"
11844
"from CommitBuilder.revision_tree() and hooks MUST NOT modify this\n"
11845
"tree."
11846
msgstr ""
11847
11848
#: en/help_topics/hooks.txt:142
11849
msgid ""
11850
"set_rh\n"
11851
"~~~~~~"
11852
msgstr ""
11853
11854
#: en/help_topics/hooks.txt:147
11855
msgid ""
11856
"Invoked whenever the revision history has been set via\n"
11857
"set_revision_history. The api signature is (branch, revision_history),\n"
11858
"and the branch will be write-locked. The set_rh hook can be expensive\n"
11859
"for bzr to trigger, a better hook to use is\n"
11860
"Branch.post_change_branch_tip."
11861
msgstr ""
11862
11863
#: en/help_topics/hooks.txt:153
11864
msgid ""
11865
"transform_fallback_location\n"
11866
"~~~~~~~~~~~~~~~~~~~~~~~~~~~"
11867
msgstr ""
11868
11869
#: en/help_topics/hooks.txt:156
11870
msgid "Introduced in: 1.9"
11871
msgstr ""
11872
11873
#: en/help_topics/hooks.txt:158
11874
msgid ""
11875
"Called when a stacked branch is activating its fallback locations.\n"
11876
"transform_fallback_location is called with (branch, url), and should\n"
11877
"return a new url. Returning the same url allows it to be used as-is,\n"
11878
"returning a different one can be used to cause the branch to stack on\n"
11879
"a closer copy of that fallback_location. Note that the branch cannot\n"
11880
"have history accessing methods called on it during this hook because\n"
11881
"the fallback locations have not been activated. When there are\n"
11882
"multiple hooks installed for transform_fallback_location, all are\n"
11883
"called with the url returned from the previous hook.The order is\n"
11884
"however undefined."
11885
msgstr ""
11886
11887
#: en/help_topics/hooks.txt:169
11888
msgid ""
11889
"CommandHooks\n"
11890
"------------"
11891
msgstr ""
11892
11893
#: en/help_topics/hooks.txt:172
11894
msgid ""
11895
"extend_command\n"
11896
"~~~~~~~~~~~~~~"
11897
msgstr ""
11898
11899
#: en/help_topics/hooks.txt:175
11900
msgid "Introduced in: 1.13"
11901
msgstr ""
11902
11903
#: en/help_topics/hooks.txt:177
11904
msgid ""
11905
"Called after creating a command object to allow modifications such as\n"
11906
"adding or removing options, docs etc. Called with the new\n"
11907
"bzrlib.commands.Command object."
11908
msgstr ""
11909
11910
#: en/help_topics/hooks.txt:181
11911
msgid ""
11912
"get_command\n"
11913
"~~~~~~~~~~~"
11914
msgstr ""
11915
11916
#: en/help_topics/hooks.txt:184 en/help_topics/hooks.txt:196
11917
#: en/help_topics/hooks.txt:205 en/help_topics/hooks.txt:448
11918
msgid "Introduced in: 1.17"
11919
msgstr ""
11920
11921
#: en/help_topics/hooks.txt:186
11922
msgid ""
11923
"Called when creating a single command. Called with (cmd_or_None,\n"
11924
"command_name). get_command should either return the cmd_or_None\n"
11925
"parameter, or a replacement Command object that should be used for the\n"
11926
"command. Note that the Command.hooks hooks are core infrastructure.\n"
11927
"Many users will prefer to use bzrlib.commands.register_command or\n"
11928
"plugin_cmds.register_lazy."
11929
msgstr ""
11930
11931
#: en/help_topics/hooks.txt:193
11932
msgid ""
11933
"get_missing_command\n"
11934
"~~~~~~~~~~~~~~~~~~~"
11935
msgstr ""
11936
11937
#: en/help_topics/hooks.txt:198
11938
msgid ""
11939
"Called when creating a single command if no command could be found.\n"
11940
"Called with (command_name). get_missing_command should either return\n"
11941
"None, or a Command object to be used for the command."
11942
msgstr ""
11943
11944
#: en/help_topics/hooks.txt:202
11945
msgid ""
11946
"list_commands\n"
11947
"~~~~~~~~~~~~~"
11948
msgstr ""
11949
11950
#: en/help_topics/hooks.txt:207
11951
msgid ""
11952
"Called when enumerating commands. Called with a set of cmd_name\n"
11953
"strings for all the commands found so far. This set is safe to mutate\n"
11954
"- e.g. to remove a command. list_commands should return the updated\n"
11955
"set of command names."
11956
msgstr ""
11957
11958
#: en/help_topics/hooks.txt:212
11959
msgid ""
11960
"_ConfigHooks\n"
11961
"------------"
11962
msgstr ""
11963
11964
#: en/help_topics/hooks.txt:215
11965
msgid ""
11966
"get\n"
11967
"~~~"
11968
msgstr ""
11969
11970
#: en/help_topics/hooks.txt:218 en/help_topics/hooks.txt:226
11971
#: en/help_topics/hooks.txt:233 en/help_topics/hooks.txt:241
11972
#: en/help_topics/hooks.txt:248 en/help_topics/hooks.txt:370
11973
#: en/help_topics/hooks.txt:427
11974
msgid "Introduced in: 2.4"
11975
msgstr ""
11976
11977
#: en/help_topics/hooks.txt:220
11978
msgid ""
11979
"Invoked when a config option is read. The signature is (stack, name,\n"
11980
"value)."
11981
msgstr ""
11982
11983
#: en/help_topics/hooks.txt:223
11984
msgid ""
11985
"load\n"
11986
"~~~~"
11987
msgstr ""
11988
11989
#: en/help_topics/hooks.txt:228
11990
msgid "Invoked when a config store is loaded. The signature is (store)."
11991
msgstr ""
11992
11993
#: en/help_topics/hooks.txt:230
11994
msgid ""
11995
"remove\n"
11996
"~~~~~~"
11997
msgstr ""
11998
11999
#: en/help_topics/hooks.txt:235
12000
msgid ""
12001
"Invoked when a config option is removed. The signature is (stack,\n"
12002
"name)."
12003
msgstr ""
12004
12005
#: en/help_topics/hooks.txt:238
12006
msgid ""
12007
"save\n"
12008
"~~~~"
12009
msgstr ""
12010
12011
#: en/help_topics/hooks.txt:243
12012
msgid "Invoked when a config store is saved. The signature is (store)."
12013
msgstr ""
12014
12015
#: en/help_topics/hooks.txt:245
12016
msgid ""
12017
"set\n"
12018
"~~~"
12019
msgstr ""
12020
12021
#: en/help_topics/hooks.txt:250
12022
msgid ""
12023
"Invoked when a config option is set. The signature is (stack, name,\n"
12024
"value)."
12025
msgstr ""
12026
12027
#: en/help_topics/hooks.txt:253
12028
msgid ""
12029
"ControlDirHooks\n"
12030
"---------------"
12031
msgstr ""
12032
12033
#: en/help_topics/hooks.txt:256
12034
msgid ""
12035
"post_repo_init\n"
12036
"~~~~~~~~~~~~~~"
12037
msgstr ""
12038
12039
#: en/help_topics/hooks.txt:261
12040
msgid ""
12041
"Invoked after a repository has been initialized. post_repo_init is\n"
12042
"called with a bzrlib.controldir.RepoInitHookParams."
12043
msgstr ""
12044
12045
#: en/help_topics/hooks.txt:264
12046
msgid ""
12047
"pre_open\n"
12048
"~~~~~~~~"
12049
msgstr ""
12050
12051
#: en/help_topics/hooks.txt:267
12052
msgid "Introduced in: 1.14"
12053
msgstr ""
12054
12055
#: en/help_topics/hooks.txt:269
12056
msgid ""
12057
"Invoked before attempting to open a ControlDir with the transport that\n"
12058
"the open will use."
12059
msgstr ""
12060
12061
#: en/help_topics/hooks.txt:272
12062
msgid ""
12063
"InfoHooks\n"
12064
"---------"
12065
msgstr ""
12066
12067
#: en/help_topics/hooks.txt:275
12068
msgid ""
12069
"repository\n"
12070
"~~~~~~~~~~"
12071
msgstr ""
12072
12073
#: en/help_topics/hooks.txt:278 en/help_topics/hooks.txt:297
12074
#: en/help_topics/hooks.txt:505
12075
msgid "Introduced in: 1.15"
12076
msgstr ""
12077
12078
#: en/help_topics/hooks.txt:280
12079
msgid ""
12080
"Invoked when displaying the statistics for a repository. repository is\n"
12081
"called with a statistics dictionary as returned by the repository and\n"
12082
"a file-like object to write to."
12083
msgstr ""
12084
12085
#: en/help_topics/hooks.txt:284
12086
msgid ""
12087
"LockHooks\n"
12088
"---------"
12089
msgstr ""
12090
12091
#: en/help_topics/hooks.txt:287
12092
msgid ""
12093
"lock_acquired\n"
12094
"~~~~~~~~~~~~~"
12095
msgstr ""
12096
12097
#: en/help_topics/hooks.txt:292
12098
msgid ""
12099
"Called with a bzrlib.lock.LockResult when a physical lock is acquired."
12100
msgstr ""
12101
12102
#: en/help_topics/hooks.txt:294
12103
msgid ""
12104
"lock_broken\n"
12105
"~~~~~~~~~~~"
12106
msgstr ""
12107
12108
#: en/help_topics/hooks.txt:299
12109
msgid "Called with a bzrlib.lock.LockResult when a physical lock is broken."
12110
msgstr ""
12111
12112
#: en/help_topics/hooks.txt:301
12113
msgid ""
12114
"lock_released\n"
12115
"~~~~~~~~~~~~~"
12116
msgstr ""
12117
12118
#: en/help_topics/hooks.txt:306
12119
msgid ""
12120
"Called with a bzrlib.lock.LockResult when a physical lock is released."
12121
msgstr ""
12122
12123
#: en/help_topics/hooks.txt:308
12124
msgid ""
12125
"MergeHooks\n"
12126
"----------"
12127
msgstr ""
12128
12129
#: en/help_topics/hooks.txt:311
12130
msgid ""
12131
"merge_file_content\n"
12132
"~~~~~~~~~~~~~~~~~~"
12133
msgstr ""
12134
12135
#: en/help_topics/hooks.txt:314
12136
msgid "Introduced in: 2.1"
12137
msgstr ""
12138
12139
#: en/help_topics/hooks.txt:316
12140
msgid ""
12141
"Called with a bzrlib.merge.Merger object to create a per file merge\n"
12142
"object when starting a merge. Should return either None or a subclass\n"
12143
"of ``bzrlib.merge.AbstractPerFileMerger``. Such objects will then be\n"
12144
"called per file that needs to be merged (including when one side has\n"
12145
"deleted the file and the other has changed it). See the\n"
12146
"AbstractPerFileMerger API docs for details on how it is used by merge."
12147
msgstr ""
12148
12149
#: en/help_topics/hooks.txt:323
12150
msgid ""
12151
"post_merge\n"
12152
"~~~~~~~~~~"
12153
msgstr ""
12154
12155
#: en/help_topics/hooks.txt:326 en/help_topics/hooks.txt:334
12156
#: en/help_topics/hooks.txt:384 en/help_topics/hooks.txt:493
12157
msgid "Introduced in: 2.5"
12158
msgstr ""
12159
12160
#: en/help_topics/hooks.txt:328
12161
msgid ""
12162
"Called after a merge. Receives a Merger object as the single argument.\n"
12163
"The return value is ignored."
12164
msgstr ""
12165
12166
#: en/help_topics/hooks.txt:331
12167
msgid ""
12168
"pre_merge\n"
12169
"~~~~~~~~~"
12170
msgstr ""
12171
12172
#: en/help_topics/hooks.txt:336
12173
msgid ""
12174
"Called before a merge. Receives a Merger object as the single\n"
12175
"argument."
12176
msgstr ""
12177
12178
#: en/help_topics/hooks.txt:339
12179
msgid ""
12180
"MergeDirectiveHooks\n"
12181
"-------------------"
12182
msgstr ""
12183
12184
#: en/help_topics/hooks.txt:342
12185
msgid ""
12186
"merge_request_body\n"
12187
"~~~~~~~~~~~~~~~~~~"
12188
msgstr ""
12189
12190
#: en/help_topics/hooks.txt:345
12191
msgid "Introduced in: 1.15.0"
12192
msgstr ""
12193
12194
#: en/help_topics/hooks.txt:347
12195
msgid ""
12196
"Called with a MergeRequestBodyParams when a body is needed for a merge\n"
12197
"request. Callbacks must return a body. If more than one callback is\n"
12198
"registered, the output of one callback is provided to the next."
12199
msgstr ""
12200
12201
#: en/help_topics/hooks.txt:351
12202
msgid ""
12203
"MessageEditorHooks\n"
12204
"------------------"
12205
msgstr ""
12206
12207
#: en/help_topics/hooks.txt:354
12208
msgid ""
12209
"commit_message_template\n"
12210
"~~~~~~~~~~~~~~~~~~~~~~~"
12211
msgstr ""
12212
12213
#: en/help_topics/hooks.txt:357
12214
msgid "Introduced in: 1.10"
12215
msgstr ""
12216
12217
#: en/help_topics/hooks.txt:359
12218
msgid ""
12219
"Called when a commit message is being generated.\n"
12220
"commit_message_template is called with the bzrlib.commit.Commit object\n"
12221
"and the message that is known so far. commit_message_template must\n"
12222
"return a new message to use (which could be the same as it was given).\n"
12223
"When there are multiple hooks registered for commit_message_template,\n"
12224
"they are chained with the result from the first passed into the\n"
12225
"second, and so on."
12226
msgstr ""
12227
12228
#: en/help_topics/hooks.txt:367
12229
msgid ""
12230
"set_commit_message\n"
12231
"~~~~~~~~~~~~~~~~~~"
12232
msgstr ""
12233
12234
#: en/help_topics/hooks.txt:372
12235
msgid ""
12236
"Set a fixed commit message. set_commit_message is called with the\n"
12237
"bzrlib.commit.Commit object (so you can also change e.g. revision\n"
12238
"properties by editing commit.builder._revprops) and the message so\n"
12239
"far. set_commit_message must return the message to use or None if it\n"
12240
"should use the message editor as normal."
12241
msgstr ""
12242
12243
#: en/help_topics/hooks.txt:378
12244
msgid ""
12245
"MutableTreeHooks\n"
12246
"----------------"
12247
msgstr ""
12248
12249
#: en/help_topics/hooks.txt:381
12250
msgid ""
12251
"post_build_tree\n"
12252
"~~~~~~~~~~~~~~~"
12253
msgstr ""
12254
12255
#: en/help_topics/hooks.txt:386
12256
msgid ""
12257
"Called after a completely new tree is built. The hook is called with\n"
12258
"the tree as its only argument."
12259
msgstr ""
12260
12261
#: en/help_topics/hooks.txt:392
12262
msgid "Introduced in: 2.0"
12263
msgstr ""
12264
12265
#: en/help_topics/hooks.txt:394
12266
msgid ""
12267
"Called after a commit is performed on a tree. The hook is called with\n"
12268
"a bzrlib.mutabletree.PostCommitHookParams object. The mutable tree the\n"
12269
"commit was performed on is available via the mutable_tree attribute of\n"
12270
"that object."
12271
msgstr ""
12272
12273
#: en/help_topics/hooks.txt:399
12274
msgid ""
12275
"start_commit\n"
12276
"~~~~~~~~~~~~"
12277
msgstr ""
12278
12279
#: en/help_topics/hooks.txt:404
12280
msgid ""
12281
"Called before a commit is performed on a tree. The start commit hook\n"
12282
"is able to change the tree before the commit takes place. start_commit\n"
12283
"is called with the bzrlib.mutabletree.MutableTree that the commit is\n"
12284
"being performed on."
12285
msgstr ""
12286
12287
#: en/help_topics/hooks.txt:409
12288
msgid ""
12289
"SmartClientHooks\n"
12290
"----------------"
12291
msgstr ""
12292
12293
#: en/help_topics/hooks.txt:412
12294
msgid ""
12295
"call\n"
12296
"~~~~"
12297
msgstr ""
12298
12299
#: en/help_topics/hooks.txt:415
12300
msgid "Introduced in: unknown"
12301
msgstr ""
12302
12303
#: en/help_topics/hooks.txt:417
12304
msgid ""
12305
"Called when the smart client is submitting a request to the smart\n"
12306
"server. Called with a bzrlib.smart.client.CallHookParams object.\n"
12307
"Streaming request bodies, and responses, are not accessible."
12308
msgstr ""
12309
12310
#: en/help_topics/hooks.txt:421
12311
msgid ""
12312
"SmartServerHooks\n"
12313
"----------------"
12314
msgstr ""
12315
12316
#: en/help_topics/hooks.txt:424
12317
msgid ""
12318
"server_exception\n"
12319
"~~~~~~~~~~~~~~~~"
12320
msgstr ""
12321
12322
#: en/help_topics/hooks.txt:429
12323
msgid ""
12324
"Called by the bzr server when an exception occurs. server_exception is\n"
12325
"called with the sys.exc_info() tuple return true for the hook if the\n"
12326
"exception has been handled, in which case the server will exit\n"
12327
"normally."
12328
msgstr ""
12329
12330
#: en/help_topics/hooks.txt:434
12331
msgid ""
12332
"server_started\n"
12333
"~~~~~~~~~~~~~~"
12334
msgstr ""
12335
12336
#: en/help_topics/hooks.txt:437 en/help_topics/hooks.txt:456
12337
msgid "Introduced in: 0.16"
12338
msgstr ""
12339
12340
#: en/help_topics/hooks.txt:439
12341
msgid ""
12342
"Called by the bzr server when it starts serving a directory.\n"
12343
"server_started is called with (backing urls, public url), where\n"
12344
"backing_url is a list of URLs giving the server-specific directory\n"
12345
"locations, and public_url is the public URL for the directory being\n"
12346
"served."
12347
msgstr ""
12348
12349
#: en/help_topics/hooks.txt:445
12350
msgid ""
12351
"server_started_ex\n"
12352
"~~~~~~~~~~~~~~~~~"
12353
msgstr ""
12354
12355
#: en/help_topics/hooks.txt:450
12356
msgid ""
12357
"Called by the bzr server when it starts serving a directory.\n"
12358
"server_started is called with (backing_urls, server_obj)."
12359
msgstr ""
12360
12361
#: en/help_topics/hooks.txt:453
12362
msgid ""
12363
"server_stopped\n"
12364
"~~~~~~~~~~~~~~"
12365
msgstr ""
12366
12367
#: en/help_topics/hooks.txt:458
12368
msgid ""
12369
"Called by the bzr server when it stops serving a directory.\n"
12370
"server_stopped is called with the same parameters as the\n"
12371
"server_started hook: (backing_urls, public_url)."
12372
msgstr ""
12373
12374
#: en/help_topics/hooks.txt:462
12375
msgid ""
12376
"StatusHooks\n"
12377
"-----------"
12378
msgstr ""
12379
12380
#: en/help_topics/hooks.txt:465
12381
msgid ""
12382
"post_status\n"
12383
"~~~~~~~~~~~"
12384
msgstr ""
12385
12386
#: en/help_topics/hooks.txt:468 en/help_topics/hooks.txt:479
12387
msgid "Introduced in: 2.3"
12388
msgstr ""
12389
12390
#: en/help_topics/hooks.txt:470
12391
msgid ""
12392
"Called with argument StatusHookParams after Bazaar has displayed the\n"
12393
"status. StatusHookParams has the attributes (old_tree, new_tree,\n"
12394
"to_file, versioned, show_ids, short, verbose). The last four arguments\n"
12395
"correspond to the command line options specified by the user for the\n"
12396
"status command. to_file is the output stream for writing."
12397
msgstr ""
12398
12399
#: en/help_topics/hooks.txt:476
12400
msgid ""
12401
"pre_status\n"
12402
"~~~~~~~~~~"
12403
msgstr ""
12404
12405
#: en/help_topics/hooks.txt:481
12406
msgid ""
12407
"Called with argument StatusHookParams before Bazaar displays the\n"
12408
"status. StatusHookParams has the attributes (old_tree, new_tree,\n"
12409
"to_file, versioned, show_ids, short, verbose). The last four arguments\n"
12410
"correspond to the command line options specified by the user for the\n"
12411
"status command. to_file is the output stream for writing."
12412
msgstr ""
12413
12414
#: en/help_topics/hooks.txt:487
12415
msgid ""
12416
"TransportHooks\n"
12417
"--------------"
12418
msgstr ""
12419
12420
#: en/help_topics/hooks.txt:490
12421
msgid ""
12422
"post_connect\n"
12423
"~~~~~~~~~~~~"
12424
msgstr ""
12425
12426
#: en/help_topics/hooks.txt:495
12427
msgid ""
12428
"Called after a new connection is established or a reconnect occurs.\n"
12429
"The sole argument passed is either the connected transport or smart\n"
12430
"medium instance."
12431
msgstr ""
12432
12433
#: en/help_topics/hooks.txt:499
12434
msgid ""
12435
"RioVersionInfoBuilderHooks\n"
12436
"--------------------------"
12437
msgstr ""
12438
12439
#: en/help_topics/hooks.txt:502
12440
msgid ""
12441
"revision\n"
12442
"~~~~~~~~"
12443
msgstr ""
12444
12445
#: en/help_topics/hooks.txt:507
12446
msgid ""
12447
"Invoked when adding information about a revision to the RIO stanza\n"
12448
"that is printed. revision is called with a revision object and a RIO\n"
12449
"stanza.\n"
12450
msgstr ""
12451
12452
#: en/help_topics/location-alias.txt:1
12453
msgid ""
12454
"Location aliases\n"
12455
"================"
12456
msgstr ""
12457
12458
#: en/help_topics/location-alias.txt:4
12459
msgid ""
12460
"Bazaar defines several aliases for locations associated with a branch. "
12461
"These\n"
12462
"can be used with most commands that expect a location, such as `bzr push`."
12463
msgstr ""
12464
12465
#: en/help_topics/location-alias.txt:7
12466
msgid "The aliases are::"
12467
msgstr ""
12468
12469
#: en/help_topics/location-alias.txt:9
12470
msgid ""
12471
" :bound The branch this branch is bound to, for bound branches.\n"
12472
" :parent The parent of this branch.\n"
12473
" :public The public location of this branch.\n"
12474
" :push The saved location used for `bzr push` with no arguments.\n"
12475
" :submit The submit branch for this branch.\n"
12476
" :this This branch."
12477
msgstr ""
12478
12479
#: en/help_topics/location-alias.txt:16
12480
msgid "For example, to push to the parent location::"
12481
msgstr ""
12482
12483
#: en/help_topics/location-alias.txt:18
12484
msgid " bzr push :parent\n"
12485
msgstr ""
12486
12487
#: en/help_topics/log-formats.txt:1
12488
msgid ""
12489
"Log Formats\n"
12490
"==========="
12491
msgstr ""
12492
12493
#: en/help_topics/log-formats.txt:4
12494
msgid ""
12495
"A log format controls how information about each revision is displayed.\n"
12496
"The standard log formats are compared below::"
12497
msgstr ""
12498
12499
#: en/help_topics/log-formats.txt:7
12500
msgid ""
12501
" Feature long short line\n"
12502
" ---------------------- ------------- ------------ -------------------\n"
12503
" design goal detailed view concise view 1 revision per line\n"
12504
" committer name+email name only name only\n"
12505
" author name+email - -\n"
12506
" date-time format full date only date only\n"
12507
" commit message full full top line\n"
12508
" tags yes yes yes\n"
12509
" merges indicator - yes -\n"
12510
" status/delta optional optional -\n"
12511
" diff/patch optional optional -\n"
12512
" revision-id optional optional -\n"
12513
" branch nick yes - -\n"
12514
" foreign vcs properties yes yes -\n"
12515
" preferred levels all 1 1\n"
12516
" digital signature optional - -"
12517
msgstr ""
12518
12519
#: en/help_topics/log-formats.txt:24
12520
msgid ""
12521
"The default format is ``long``. To change this, define the ``log_format``\n"
12522
"setting in the ``[DEFAULT]`` section of ``bazaar.conf`` like this (say)::"
12523
msgstr ""
12524
12525
#: en/help_topics/log-formats.txt:27
12526
msgid ""
12527
" [DEFAULT]\n"
12528
" log_format = short"
12529
msgstr ""
12530
12531
#: en/help_topics/log-formats.txt:30
12532
msgid ""
12533
"Alternatively, to change the log format used for a given query, use the\n"
12534
"--long, --short or --line options."
12535
msgstr ""
12536
12537
#: en/help_topics/log-formats.txt:33
12538
msgid ""
12539
"If one of the standard log formats does not meet your needs, additional\n"
12540
"formats can be provided by plugins.\n"
12541
msgstr ""
12542
12543
#: en/help_topics/other-formats.txt:1
12544
msgid "Other Storage Formats"
12545
msgstr ""
12546
12547
#: en/help_topics/other-formats.txt:3
12548
msgid "Experimental formats are shown below."
12549
msgstr ""
12550
12551
#: en/help_topics/other-formats.txt:5
12552
msgid ""
12553
":development-colo:\n"
12554
" (native) The 2a format with experimental support for colocated\n"
12555
" branches."
12556
msgstr ""
12557
12558
#: en/help_topics/other-formats.txt:9
12559
msgid ""
12560
"\n"
12561
"Deprecated formats are shown below."
12562
msgstr ""
12563
12564
#: en/help_topics/other-formats.txt:12
12565
msgid ""
12566
":pack-0.92:\n"
12567
" (native) Pack-based format used in 1.x series. Introduced in 0.92.\n"
12568
" Interoperates with bzr repositories before 0.92 but cannot be read\n"
12569
" by bzr < 0.92."
12570
msgstr ""
12571
12572
#: en/help_topics/patterns.txt:1
12573
msgid ""
12574
"Patterns\n"
12575
"========"
12576
msgstr ""
12577
12578
#: en/help_topics/patterns.txt:4
12579
msgid ""
12580
"Bazaar uses patterns to match files at various times. For example,\n"
12581
"the ``add`` command skips over files that match ignore patterns\n"
12582
"and preferences can be associated with files using rule patterns.\n"
12583
"The pattern syntax is described below."
12584
msgstr ""
12585
12586
#: en/help_topics/patterns.txt:9
12587
msgid ""
12588
"Trailing slashes on patterns are ignored. If the pattern contains a\n"
12589
"slash or is a regular expression, it is compared to the whole path\n"
12590
"from the branch root. Otherwise, it is compared to only the last\n"
12591
"component of the path. To match a file only in the root directory,\n"
12592
"prepend ``./``. Patterns specifying absolute paths are not allowed."
12593
msgstr ""
12594
12595
#: en/help_topics/patterns.txt:15
12596
msgid "Patterns may include globbing wildcards such as::"
12597
msgstr ""
12598
12599
#: en/help_topics/patterns.txt:17
12600
msgid ""
12601
" ? - Matches any single character except '/'\n"
12602
" * - Matches 0 or more characters except '/'\n"
12603
" /**/ - Matches 0 or more directories in a path\n"
12604
" [a-z] - Matches a single character from within a group of characters"
12605
msgstr ""
12606
12607
#: en/help_topics/patterns.txt:22
12608
msgid ""
12609
"Patterns may also be `Python regular expressions`_. Regular expression\n"
12610
"patterns are identified by a ``RE:`` prefix followed by the regular\n"
12611
"expression. Regular expression patterns may not include named or\n"
12612
"numbered groups."
12613
msgstr ""
12614
12615
#: en/help_topics/patterns.txt:27
12616
msgid ""
12617
"Case insensitive ignore patterns can be specified with regular expressions\n"
12618
"by using the ``i`` (for ignore case) flag in the pattern."
12619
msgstr ""
12620
12621
#: en/help_topics/patterns.txt:30
12622
msgid ""
12623
"For example, a case insensitive match for ``foo`` may be specified as::"
12624
msgstr ""
12625
12626
#: en/help_topics/patterns.txt:32
12627
msgid " RE:(?i)foo"
12628
msgstr ""
12629
12630
#: en/help_topics/patterns.txt:34
12631
msgid ""
12632
"Ignore patterns may be prefixed with ``!``, which means that a filename\n"
12633
"matched by that pattern will not be ignored."
12634
msgstr ""
12635
12636
#: en/help_topics/patterns.txt:37
12637
msgid ""
12638
".. _Python regular expressions: http://docs.python.org/library/re.html"
12639
msgstr ""
12640
12641
#: en/help_topics/revisionspec.txt:1
12642
msgid "Revision Identifiers"
12643
msgstr ""
12644
12645
#: en/help_topics/revisionspec.txt:3
12646
msgid ""
12647
"A revision identifier refers to a specific state of a branch's history. It\n"
12648
"can be expressed in several ways. It can begin with a keyword to\n"
12649
"unambiguously specify a given lookup type; some examples are 'last:1',\n"
12650
"'before:yesterday' and 'submit:'."
12651
msgstr ""
12652
12653
#: en/help_topics/revisionspec.txt:8
12654
msgid ""
12655
"Alternately, it can be given without a keyword, in which case it will be\n"
12656
"checked as a revision number, a tag, a revision id, a date specification, or "
12657
"a\n"
12658
"branch specification, in that order. For example, 'date:today' could be\n"
12659
"written as simply 'today', though if you have a tag called 'today' that "
12660
"will\n"
12661
"be found first."
12662
msgstr ""
12663
12664
#: en/help_topics/revisionspec.txt:14
12665
msgid ""
12666
"If 'REV1' and 'REV2' are revision identifiers, then 'REV1..REV2' denotes a\n"
12667
"revision range. Examples: '3647..3649', 'date:yesterday..-1' and\n"
12668
"'branch:/path/to/branch1/..branch:/branch2' (note that there are no quotes "
12669
"or\n"
12670
"spaces around the '..')."
12671
msgstr ""
12672
12673
#: en/help_topics/revisionspec.txt:19
12674
msgid ""
12675
"Ranges are interpreted differently by different commands. To the \"log\" "
12676
"command,\n"
12677
"a range is a sequence of log messages, but to the \"diff\" command, the "
12678
"range\n"
12679
"denotes a change between revisions (and not a sequence of changes). In\n"
12680
"addition, \"log\" considers a closed range whereas \"diff\" and \"merge\" "
12681
"consider it\n"
12682
"to be open-ended, that is, they include one end but not the other. For "
12683
"example:\n"
12684
"\"bzr log -r 3647..3649\" shows the messages of revisions 3647, 3648 and "
12685
"3649,\n"
12686
"while \"bzr diff -r 3647..3649\" includes the changes done in revisions 3648 "
12687
"and\n"
12688
"3649, but not 3647."
12689
msgstr ""
12690
12691
#: en/help_topics/revisionspec.txt:28
12692
msgid "The keywords used as revision selection methods are the following:"
12693
msgstr ""
12694
12695
#: en/help_topics/revisionspec.txt:30
12696
msgid ""
12697
":revid:\n"
12698
"\tSelects a revision using the revision id.\n"
12699
":submit:\n"
12700
"\tSelects a common ancestor with the submit branch.\n"
12701
":ancestor:\n"
12702
"\tSelects a common ancestor with a second branch.\n"
12703
":date:\n"
12704
"\tSelects a revision on the basis of a datestamp.\n"
12705
":branch:\n"
12706
"\tSelects the last revision of a specified branch.\n"
12707
":tag:\n"
12708
"\tSelects a revision identified by a tag name.\n"
12709
":revno:\n"
12710
"\tSelects a revision using a number.\n"
12711
":before:\n"
12712
"\tSelects the parent of the revision specified.\n"
12713
":annotate:\n"
12714
"\tSelect the revision that last modified the specified line.\n"
12715
":mainline:\n"
12716
"\tSelect mainline revision that merged the specified revision.\n"
12717
":last:\n"
12718
"\tSelects the nth revision from the end."
12719
msgstr ""
12720
12721
#: en/help_topics/revisionspec.txt:53
12722
msgid "In addition, plugins can provide other keywords."
12723
msgstr ""
12724
12725
#: en/help_topics/revisionspec.txt:55
12726
msgid "A detailed description of each keyword is given below."
12727
msgstr ""
12728
12729
#: en/help_topics/revisionspec.txt:57
12730
msgid ":revid:"
12731
msgstr ""
12732
12733
#: en/help_topics/revisionspec.txt:59
12734
msgid ""
12735
" Supply a specific revision id, that can be used to specify any\n"
12736
" revision id in the ancestry of the branch.\n"
12737
" Including merges, and pending merges.\n"
12738
" Examples::"
12739
msgstr ""
12740
12741
#: en/help_topics/revisionspec.txt:64
12742
msgid ""
12743
" revid:aaaa@bbbb-123456789 -> Select revision 'aaaa@bbbb-123456789'"
12744
msgstr ""
12745
12746
#: en/help_topics/revisionspec.txt:66
12747
msgid ":submit:"
12748
msgstr ""
12749
12750
#: en/help_topics/revisionspec.txt:68
12751
msgid ""
12752
" Diffing against this shows all the changes that were made in this "
12753
"branch,\n"
12754
" and is a good predictor of what merge will do. The submit branch is\n"
12755
" used by the bundle and merge directive commands. If no submit branch\n"
12756
" is specified, the parent branch is used instead."
12757
msgstr ""
12758
12759
#: en/help_topics/revisionspec.txt:73 en/help_topics/revisionspec.txt:85
12760
msgid ""
12761
" The common ancestor is the last revision that existed in both\n"
12762
" branches. Usually this is the branch point, but it could also be\n"
12763
" a revision that was merged."
12764
msgstr ""
12765
12766
#: en/help_topics/revisionspec.txt:77 en/help_topics/revisionspec.txt:93
12767
#: en/help_topics/revisionspec.txt:109 en/help_topics/revisionspec.txt:119
12768
#: en/help_topics/revisionspec.txt:153
12769
msgid " Examples::"
12770
msgstr ""
12771
12772
#: en/help_topics/revisionspec.txt:79
12773
msgid " $ bzr diff -r submit:"
12774
msgstr ""
12775
12776
#: en/help_topics/revisionspec.txt:81
12777
msgid ":ancestor:"
12778
msgstr ""
12779
12780
#: en/help_topics/revisionspec.txt:83
12781
msgid " Supply the path to a branch to select the common ancestor."
12782
msgstr ""
12783
12784
#: en/help_topics/revisionspec.txt:89
12785
msgid ""
12786
" This is frequently used with 'diff' to return all of the changes\n"
12787
" that your branch introduces, while excluding the changes that you\n"
12788
" have not merged from the remote branch."
12789
msgstr ""
12790
12791
#: en/help_topics/revisionspec.txt:95
12792
msgid ""
12793
" ancestor:/path/to/branch\n"
12794
" $ bzr diff -r ancestor:../../mainline/branch"
12795
msgstr ""
12796
12797
#: en/help_topics/revisionspec.txt:98
12798
msgid ":date:"
12799
msgstr ""
12800
12801
#: en/help_topics/revisionspec.txt:100
12802
msgid ""
12803
" Supply a datestamp to select the first revision that matches the date.\n"
12804
" Date can be 'yesterday', 'today', 'tomorrow' or a YYYY-MM-DD string.\n"
12805
" Matches the first entry after a given date (either at midnight or\n"
12806
" at a specified time)."
12807
msgstr ""
12808
12809
#: en/help_topics/revisionspec.txt:105
12810
msgid " One way to display all the changes since yesterday would be::"
12811
msgstr ""
12812
12813
#: en/help_topics/revisionspec.txt:107
12814
msgid " bzr log -r date:yesterday.."
12815
msgstr ""
12816
12817
#: en/help_topics/revisionspec.txt:111
12818
msgid ""
12819
" date:yesterday -> select the first revision since "
12820
"yesterday\n"
12821
" date:2006-08-14,17:10:14 -> select the first revision after\n"
12822
" August 14th, 2006 at 5:10pm."
12823
msgstr ""
12824
12825
#: en/help_topics/revisionspec.txt:115
12826
msgid ":branch:"
12827
msgstr ""
12828
12829
#: en/help_topics/revisionspec.txt:117
12830
msgid " Supply the path to a branch to select its last revision."
12831
msgstr ""
12832
12833
#: en/help_topics/revisionspec.txt:121
12834
msgid " branch:/path/to/branch"
12835
msgstr ""
12836
12837
#: en/help_topics/revisionspec.txt:123
12838
msgid ":tag:"
12839
msgstr ""
12840
12841
#: en/help_topics/revisionspec.txt:125
12842
msgid " Tags are stored in the branch and created by the 'tag' command."
12843
msgstr ""
12844
12845
#: en/help_topics/revisionspec.txt:127
12846
msgid ":revno:"
12847
msgstr ""
12848
12849
#: en/help_topics/revisionspec.txt:129
12850
msgid ""
12851
" Use an integer to specify a revision in the history of the branch.\n"
12852
" Optionally a branch can be specified. A negative number will count\n"
12853
" from the end of the branch (-1 is the last revision, -2 the previous\n"
12854
" one). If the negative number is larger than the branch's history, the\n"
12855
" first revision is returned.\n"
12856
" Examples::"
12857
msgstr ""
12858
12859
#: en/help_topics/revisionspec.txt:136
12860
msgid ""
12861
" revno:1 -> return the first revision of this branch\n"
12862
" revno:3:/path/to/branch -> return the 3rd revision of\n"
12863
" the branch '/path/to/branch'\n"
12864
" revno:-1 -> The last revision in a branch.\n"
12865
" -2:http://other/branch -> The second to last revision in the\n"
12866
" remote branch.\n"
12867
" -1000000 -> Most likely the first revision, unless\n"
12868
" your history is very long."
12869
msgstr ""
12870
12871
#: en/help_topics/revisionspec.txt:145
12872
msgid ":before:"
12873
msgstr ""
12874
12875
#: en/help_topics/revisionspec.txt:147
12876
msgid ""
12877
" Supply any revision spec to return the parent of that revision. This "
12878
"is\n"
12879
" mostly useful when inspecting revisions that are not in the revision "
12880
"history\n"
12881
" of a branch."
12882
msgstr ""
12883
12884
#: en/help_topics/revisionspec.txt:151
12885
msgid ""
12886
" It is an error to request the parent of the null revision (before:0)."
12887
msgstr ""
12888
12889
#: en/help_topics/revisionspec.txt:155
12890
msgid ""
12891
" before:1913 -> Return the parent of revno 1913 (revno 1912)\n"
12892
" before:revid:aaaa@bbbb-1234567890 -> return the parent of revision\n"
12893
" aaaa@bbbb-1234567890\n"
12894
" bzr diff -r before:1913..1913\n"
12895
" -> Find the changes between revision 1913 and its parent "
12896
"(1912).\n"
12897
" (What changes did revision 1913 introduce).\n"
12898
" This is equivalent to: bzr diff -c 1913"
12899
msgstr ""
12900
12901
#: en/help_topics/revisionspec.txt:163
12902
msgid ":annotate:"
12903
msgstr ""
12904
12905
#: en/help_topics/revisionspec.txt:165
12906
msgid ""
12907
" Select the revision that last modified the specified line. Line is\n"
12908
" specified as path:number. Path is a relative path to the file. "
12909
"Numbers\n"
12910
" start at 1, and are relative to the current version, not the last-\n"
12911
" committed version of the file."
12912
msgstr ""
12913
12914
#: en/help_topics/revisionspec.txt:170
12915
msgid ":mainline:"
12916
msgstr ""
12917
12918
#: en/help_topics/revisionspec.txt:172
12919
msgid ""
12920
" Select the revision that merged the specified revision into mainline."
12921
msgstr ""
12922
12923
#: en/help_topics/revisionspec.txt:174
12924
msgid ":last:"
12925
msgstr ""
12926
12927
#: en/help_topics/revisionspec.txt:176
12928
msgid ""
12929
" Supply a positive number to get the nth revision from the end.\n"
12930
" This is the same as supplying negative numbers to the 'revno:' spec.\n"
12931
" Examples::"
12932
msgstr ""
12933
12934
#: en/help_topics/revisionspec.txt:180
12935
msgid ""
12936
" last:1 -> return the last revision\n"
12937
" last:3 -> return the revision 2 before the end.\n"
12938
msgstr ""
12939
12940
#: en/help_topics/rules.txt:1
12941
msgid ""
12942
"Rules\n"
12943
"====="
12944
msgstr ""
12945
12946
#: en/help_topics/rules.txt:7
12947
msgid ""
12948
"Rules are defined in ini file format where the sections are file glob\n"
12949
"patterns and the contents of each section are the preferences for files\n"
12950
"matching that pattern(s). For example::"
12951
msgstr ""
12952
12953
#: en/help_topics/rules.txt:11
12954
msgid ""
12955
" [name *.bat]\n"
12956
" eol = native"
12957
msgstr ""
12958
12959
#: en/help_topics/rules.txt:14
12960
msgid ""
12961
" [name *.html *.xml]\n"
12962
" keywords = xml_escape"
12963
msgstr ""
12964
12965
#: en/help_topics/rules.txt:17
12966
msgid ""
12967
"Preferences like these are useful for commands and plugins wishing to\n"
12968
"provide custom behaviour for selected files. For more information on \n"
12969
"end of line conversion see :doc:`eol-help`.\n"
12970
"Keyword support is provided by the `keywords plugin\n"
12971
"<http://doc.bazaar.canonical.com/plugins/en/keywords-plugin.html>`_."
12972
msgstr ""
12973
12974
#: en/help_topics/rules.txt:23
12975
msgid ""
12976
"Files\n"
12977
"-----"
12978
msgstr ""
12979
12980
#: en/help_topics/rules.txt:26
12981
msgid ""
12982
"Default rules for all branches are defined in the optional file\n"
12983
"``BZR_HOME/rules``. "
12984
msgstr ""
12985
12986
#: en/help_topics/rules.txt:29
12987
msgid ""
12988
"Rule Patterns\n"
12989
"-------------"
12990
msgstr ""
12991
12992
#: en/help_topics/rules.txt:32
12993
msgid ""
12994
"Patterns are ordered and searching stops as soon as one matches.\n"
12995
"As a consequence, more explicit patterns should be placed towards\n"
12996
"the top of the file. Rule patterns use exactly the same conventions\n"
12997
"as ignore patterns. See :doc:`patterns-help` for details."
12998
msgstr ""
12999
13000
#: en/help_topics/rules.txt:37
13001
msgid ".. note::"
13002
msgstr ""
13003
13004
#: en/help_topics/rules.txt:39
13005
msgid ""
13006
" Patterns containing square brackets or spaces should be\n"
13007
" surrounded in quotes to ensure they are correctly parsed.\n"
13008
msgstr ""
13009
13010
#: en/help_topics/topics.txt:1
13011
msgid ""
13012
"authentication Information on configuring authentication\n"
13013
"basic Basic commands\n"
13014
"branches Information on what a branch is\n"
13015
"bugs Bug tracker settings\n"
13016
"checkouts Information on what a checkout is\n"
13017
"commands Basic help for all commands\n"
13018
"configuration Details on the configuration settings available\n"
13019
"conflict-types Types of conflicts and what to do about them\n"
13020
"content-filters Conversion of content into/from working trees\n"
13021
"criss-cross Information on criss-cross merging\n"
13022
"current-formats Current storage formats\n"
13023
"debug-flags Options to show or record debug information\n"
13024
"diverged-branches How to fix diverged branches\n"
13025
"env-variables Environment variable names and values\n"
13026
"eol Information on end-of-line handling\n"
13027
"files Information on configuration and log files\n"
13028
"formats Information on choosing a storage format\n"
13029
"global-options Options that control how Bazaar runs\n"
13030
"hidden-commands All hidden commands\n"
13031
"hooks Points at which custom processing can be added\n"
13032
"launchpad Using Bazaar with Launchpad.net\n"
13033
"location-alias Aliases for remembered locations\n"
13034
"log-formats Details on the logging formats available\n"
13035
"other-formats Experimental and deprecated storage formats\n"
13036
"patterns Information on the pattern syntax\n"
13037
"repositories Basic information on shared repositories.\n"
13038
"revisionspec Explain how to use --revision\n"
13039
"rules Information on defining rule-based preferences\n"
13040
"standalone-trees Information on what a standalone tree is\n"
13041
"standard-options Options that can be used with any command\n"
13042
"status-flags Help on status flags\n"
13043
"sync-for-reconfigure Steps to resolve \"out-of-sync\" when reconfiguring\n"
13044
"topics Topics list\n"
13045
"url-special-chars Special character handling in URLs\n"
13046
"urlspec Supported transport protocols\n"
13047
"working-trees Information on working trees\n"
13048
msgstr ""
13049
13050
#: en/help_topics/url-special-chars.txt:1
13051
msgid ""
13052
"Special character handling in URLs\n"
13053
"=================================="
13054
msgstr ""
13055
13056
#: en/help_topics/url-special-chars.txt:4
13057
msgid "Bazaar allows locations to be specified in multiple ways, either:"
13058
msgstr ""
13059
13060
#: en/help_topics/url-special-chars.txt:6
13061
msgid " * Fully qualified URLs"
13062
msgstr ""
13063
13064
#: en/help_topics/url-special-chars.txt:8
13065
msgid " * File system paths, relative or absolute"
13066
msgstr ""
13067
13068
#: en/help_topics/url-special-chars.txt:10
13069
msgid ""
13070
"Internally bzr treats all locations as URLs. For any file system paths\n"
13071
"that are specified it will automatically determine the appropriate URL\n"
13072
"representation, and escape special characters where necessary."
13073
msgstr ""
13074
13075
#: en/help_topics/url-special-chars.txt:14
13076
msgid ""
13077
"There are a few characters which have special meaning in URLs and need "
13078
"careful\n"
13079
"handling to avoid ambiguities. Characters can be escaped with a % and a hex\n"
13080
"value in URLs. Any non-ASCII characters in a file path will automatically "
13081
"be\n"
13082
"urlencoded when the path is converted to a URL."
13083
msgstr ""
13084
13085
#: en/help_topics/url-special-chars.txt:19
13086
msgid ""
13087
"URLs represent non-ASCII characters in an encoding defined by the server, "
13088
"but\n"
13089
"usually UTF-8. The % escapes should be of the UTF-8 bytes. Bazaar tries to "
13090
"be\n"
13091
"generous in what it accepts as a URL and to print them in a way that\n"
13092
"will be readable."
13093
msgstr ""
13094
13095
#: en/help_topics/url-special-chars.txt:24
13096
msgid ""
13097
"For example, if you have a directory named '/tmp/%2False' these are all "
13098
"valid\n"
13099
"ways of accessing the content (0x2F, or 47, is the ASCII code for forward "
13100
"slash)::"
13101
msgstr ""
13102
13103
#: en/help_topics/url-special-chars.txt:27
13104
msgid ""
13105
" cd /tmp\n"
13106
" bzr log /tmp/%2False\n"
13107
" bzr log %2False\n"
13108
" bzr log file:///tmp/%252False\n"
13109
" bzr log file://localhost/tmp/%252False\n"
13110
" bzr log file:%252False"
13111
msgstr ""
13112
13113
#: en/help_topics/url-special-chars.txt:34
13114
msgid "These are valid but do not refer to the same file::"
13115
msgstr ""
13116
13117
#: en/help_topics/url-special-chars.txt:36
13118
msgid ""
13119
" bzr log file:///tmp/%2False (refers to a file called /tmp/\\/alse)\n"
13120
" bzr log %252False (refers to a file called /tmp/%252False)"
13121
msgstr ""
13122
13123
#: en/help_topics/url-special-chars.txt:39
13124
msgid ""
13125
"Comma also has special meaning in URLs, because it denotes `segment "
13126
"parameters`_"
13127
msgstr ""
13128
13129
#: en/help_topics/url-special-chars.txt:41
13130
msgid ""
13131
"_`segment parameters`: http://www.ietf.org/rfc/rfc3986.txt (section 3.3)"
13132
msgstr ""
13133
13134
#: en/help_topics/url-special-chars.txt:43
13135
msgid ""
13136
"Comma is also special in any file system paths that are specified. To use a "
13137
"literal\n"
13138
"comma in a file system path, specify a URL and URL encode the comma::"
13139
msgstr ""
13140
13141
#: en/help_topics/url-special-chars.txt:46
13142
msgid ""
13143
" bzr log foo,branch=bla # path \"foo\" with the segment parameter "
13144
"\"branch\" set to \"bla\"\n"
13145
" bzr log file:foo%2Cbranch=bla # path \"foo,branch=bla\"\n"
13146
" bzr log file:foo,branch=bla # path \"foo\" with segment parameter "
13147
"\"branch\" set to \"bla\"\n"
13148
msgstr ""
13149
13150
#: en/help_topics/urlspec.txt:1
13151
msgid "URL Identifiers"
13152
msgstr ""
13153
13154
#: en/help_topics/urlspec.txt:3
13155
msgid "Supported URL prefixes::"
13156
msgstr ""
13157
13158
#: en/help_topics/urlspec.txt:5
13159
msgid ""
13160
" aftp:// Access using active FTP.\n"
13161
" bzr:// Fast access using the Bazaar smart server.\n"
13162
" bzr+ssh:// Fast access using the Bazaar smart server over SSH.\n"
13163
" file:// Access using the standard filesystem (default)\n"
13164
" ftp:// Access using passive FTP.\n"
13165
" http:// Read-only access of branches exported on the web.\n"
13166
" https:// Read-only access of branches exported on the web using "
13167
"SSL.\n"
13168
" sftp:// Access using SFTP (most SSH servers provide SFTP)."
13169
msgstr ""
13170
13171
#: en/help_topics/urlspec.txt:14
13172
msgid "Supported modifiers::"
13173
msgstr ""
13174
13175
#: en/help_topics/urlspec.txt:16
13176
msgid " gio+ Access using any GIO supported protocols."
13177
msgstr ""
13178
13179
#: en/help_topics/urlspec.txt:18
13180
msgid "Bazaar supports all of the standard parts within the URL::"
13181
msgstr ""
13182
13183
#: en/help_topics/urlspec.txt:20
13184
msgid " <protocol>://[user[:password]@]host[:port]/[path]"
13185
msgstr ""
13186
13187
#: en/help_topics/urlspec.txt:22
13188
msgid "allowing URLs such as::"
13189
msgstr ""
13190
13191
#: en/help_topics/urlspec.txt:24
13192
msgid " http://bzruser:BadPass@bzr.example.com:8080/bzr/trunk"
13193
msgstr ""
13194
13195
#: en/help_topics/urlspec.txt:26
13196
msgid ""
13197
"For bzr+ssh:// and sftp:// URLs, Bazaar also supports paths that begin\n"
13198
"with '~' as meaning that the rest of the path should be interpreted\n"
13199
"relative to the remote user's home directory. For example if the user\n"
13200
"``remote`` has a home directory of ``/home/remote`` on the server\n"
13201
"shell.example.com, then::"
13202
msgstr ""
13203
13204
#: en/help_topics/urlspec.txt:32
13205
msgid " bzr+ssh://remote@shell.example.com/~/myproject/trunk"
13206
msgstr ""
13207
13208
#: en/help_topics/urlspec.txt:34
13209
msgid "would refer to ``/home/remote/myproject/trunk``."
13210
msgstr ""
13211
13212
#: en/help_topics/urlspec.txt:36
13213
msgid ""
13214
"Many commands that accept URLs also accept location aliases too.\n"
13215
"See :doc:`location-alias-help` and :doc:`url-special-chars-help`.\n"
13216
msgstr ""
Loggerhead is a web-based interface for Breezy
Version: 2.0.1