« back to all changes in this revision
Viewing changes to po/fr.po
- browse files at revision 6159.2.8
- compare with another revision
- download diff
- download tarball
- view history from revision 6159.2.8
- Committer: Jelmer Vernooij
- Date: 2012-04-16 11:08:11 UTC
- mfrom: (6521 +trunk)
- mto: This revision was merged to the branch mainline in revision 6522.
- Revision ID: jelmer@samba.org-20120416110811-0y996ihqy9o2bb1t
Merge bzr.dev.
- files added:
- bzrlib/plugins/launchpad/cmds.py
- files removed:
- bzrlib/doc_generate/builders
- bzrlib/doc_generate/writers
- bzrlib/tests/doc_generate
- bzrlib/tests/doc_generate/builders
- bzrlib/tests/doc_generate/writers
- files modified:
- Makefile
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-02-02 17:39+0100\n"
11
"PO-Revision-Date: 2012-01-16 16:40+0000\n"
12
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
13
"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-02-04 06:19+0000\n"
19
"X-Generator: Launchpad (build 14738)\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:3205
30
#, python-format
31
msgid "Pushed up to revision %d."
32
msgstr "Publication jusqu'à la révision %d."
33
34
#: bzrlib/branch.py:3207
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:3210
42
msgid "No new revisions or tags to push."
43
msgstr "Pas de nouvelles révisions ou étiquettes à publier."
44
45
#: bzrlib/branch.py:3212
46
msgid "No new revisions to push."
47
msgstr "Aucune nouvelle révision à envoyer."
48
49
#: bzrlib/branch.py:3232
50
msgid "checked branch {0} format {1}"
51
msgstr ""
52
53
#: bzrlib/branch.py:3235
54
#, python-format
55
msgid "found error:%s"
56
msgstr "erreur trouvée : %s"
57
58
#: bzrlib/builtins.py:209 bzrlib/builtins.py:3016 bzrlib/workingtree.py:315
59
#, python-format
60
msgid "Ignoring files outside view. View is %s"
61
msgstr ""
62
63
#: bzrlib/builtins.py:218
64
#, python-format
65
msgid "bzr %s --revision takes exactly one revision identifier"
66
msgstr ""
67
68
#: bzrlib/builtins.py:303
69
msgid "Display status summary."
70
msgstr ""
71
72
#: bzrlib/builtins.py:305
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:308
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:311
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:315
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:320
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:323
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:326
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:329
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:334
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:337
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:341
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:346
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:351
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:354
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:363
189
msgid "Use short status indicators."
190
msgstr ""
191
192
#: bzrlib/builtins.py:365
193
msgid "Only show versioned files."
194
msgstr ""
195
196
#: bzrlib/builtins.py:367
197
msgid "Don't show pending merges."
198
msgstr ""
199
200
#: bzrlib/builtins.py:370
201
msgid "Do not mark object type using indicator."
202
msgstr ""
203
204
#: bzrlib/builtins.py:385
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:429 bzrlib/builtins.py:5183
210
msgid "You can only supply one of revision_id or --revision"
211
msgstr ""
212
213
#: bzrlib/builtins.py:432 bzrlib/builtins.py:5185
214
msgid "You must supply either --revision or a revision_id"
215
msgstr ""
216
217
#: bzrlib/builtins.py:439
218
#, python-format
219
msgid "Repository %r does not support access to raw revision texts"
220
msgstr ""
221
222
#: bzrlib/builtins.py:450
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:457
227
msgid "You cannot specify a NULL revision."
228
msgstr ""
229
230
#: bzrlib/builtins.py:549
231
msgid "Remove the working tree from a given branch/checkout."
232
msgstr ""
233
234
#: bzrlib/builtins.py:551
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:554
241
msgid "To re-create the working tree, use \"bzr checkout\"."
242
msgstr ""
243
244
#: bzrlib/builtins.py:560
245
msgid ""
246
"Remove the working tree even if it has uncommitted or shelved changes."
247
msgstr ""
248
249
#: bzrlib/builtins.py:574
250
msgid "No working tree to remove"
251
msgstr ""
252
253
#: bzrlib/builtins.py:576
254
msgid "You cannot remove the working tree of a remote path"
255
msgstr ""
256
257
#: bzrlib/builtins.py:585
258
msgid "You cannot remove the working tree from a lightweight checkout"
259
msgstr ""
260
261
#: bzrlib/builtins.py:625
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:636
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:640
274
msgid "failed to reset the tree state{0}"
275
msgstr ""
276
277
#: bzrlib/builtins.py:644
278
msgid "Show current revision number."
279
msgstr "Afficher le numéro de la révision actuelle."
280
281
#: bzrlib/builtins.py:646
282
msgid "This is equal to the number of revisions on this branch."
283
msgstr ""
284
285
#: bzrlib/builtins.py:659
286
msgid "--tree and --revision can not be used together"
287
msgstr ""
288
289
#: bzrlib/builtins.py:676 bzrlib/builtins.py:5967
290
msgid "Tags can only be placed on a single revision, not on a range"
291
msgstr ""
292
293
#: bzrlib/builtins.py:700
294
msgid "Show revno of working tree."
295
msgstr ""
296
297
#: bzrlib/builtins.py:748
298
msgid "Add specified files or directories."
299
msgstr ""
300
301
#: bzrlib/builtins.py:750
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:754
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:762
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:765
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:768
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:773
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:776
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:784
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:787
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:794
370
msgid "Don't recursively add the contents of directories."
371
msgstr ""
372
373
#: bzrlib/builtins.py:800
374
msgid "Lookup file ids from this tree."
375
msgstr ""
376
377
#: bzrlib/builtins.py:836
378
msgid "ignored {0} matching \"{1}\"\n"
379
msgstr ""
380
381
#: bzrlib/builtins.py:841
382
msgid "Create a new versioned directory."
383
msgstr ""
384
385
#: bzrlib/builtins.py:843
386
msgid "This is equivalent to creating the directory and then adding it."
387
msgstr ""
388
389
#: bzrlib/builtins.py:850
390
msgid "No error if existing, make parent directories as needed."
391
msgstr ""
392
393
#: bzrlib/builtins.py:884
394
#, python-format
395
msgid "added %s\n"
396
msgstr "ajouté %s\n"
397
398
#: bzrlib/builtins.py:926
399
#, python-format
400
msgid "invalid kind %r specified"
401
msgstr ""
402
403
#: bzrlib/builtins.py:963
404
msgid "Move or rename a file."
405
msgstr "Déplacer ou renommer un fichier."
406
407
#: bzrlib/builtins.py:965
408
msgid " bzr mv SOURCE... DESTINATION"
409
msgstr ""
410
411
#: bzrlib/builtins.py:967
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:971
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:977
428
msgid "Files cannot be moved between branches."
429
msgstr ""
430
431
#: bzrlib/builtins.py:984
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:986
438
msgid "Automatically guess renames."
439
msgstr ""
440
441
#: bzrlib/builtins.py:987
442
msgid "Avoid making changes when guessing renames."
443
msgstr ""
444
445
#: bzrlib/builtins.py:996
446
msgid "--dry-run requires --auto."
447
msgstr ""
448
449
#: bzrlib/builtins.py:1000
450
msgid "missing file argument"
451
msgstr ""
452
453
#: bzrlib/builtins.py:1004
454
msgid "can not move root of branch"
455
msgstr ""
456
457
#: bzrlib/builtins.py:1010
458
msgid "Only one path may be specified to --auto."
459
msgstr ""
460
461
#: bzrlib/builtins.py:1013
462
msgid "--after cannot be specified with --auto."
463
msgstr ""
464
465
#: bzrlib/builtins.py:1050
466
msgid "to mv multiple files the destination must be a versioned directory"
467
msgstr ""
468
469
#: bzrlib/builtins.py:1102
470
msgid "Turn this branch into a mirror of another branch."
471
msgstr ""
472
473
#: bzrlib/builtins.py:1104
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:1109
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:1113
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:1117
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:1122
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:1126
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:1134
518
msgid "Show logs of pulled revisions."
519
msgstr ""
520
521
#: bzrlib/builtins.py:1136
522
msgid ""
523
"Branch to pull into, rather than the one containing the working directory."
524
msgstr ""
525
526
#: bzrlib/builtins.py:1139
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:1168
533
msgid "Need working tree for --show-base."
534
msgstr ""
535
536
#: bzrlib/builtins.py:1184
537
msgid "No pull location known or specified."
538
msgstr ""
539
540
#: bzrlib/builtins.py:1190
541
#, python-format
542
msgid "Using saved parent location: %s\n"
543
msgstr ""
544
545
#: bzrlib/builtins.py:1197 bzrlib/builtins.py:4393
546
msgid "Cannot use -r with merge directives or bundles"
547
msgstr ""
548
549
#: bzrlib/builtins.py:1238
550
msgid "Update a mirror of this branch."
551
msgstr ""
552
553
#: bzrlib/builtins.py:1240
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:1243
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:1246
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:1250
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:1253
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:1257
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:1262
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:1273 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:1276
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:1281
612
msgid ""
613
"Create a stacked branch that references the public location of the parent "
614
"branch."
615
msgstr ""
616
617
#: bzrlib/builtins.py:1284
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:1289 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:1292
631
msgid "Don't populate the working tree, even for protocols that support it."
632
msgstr ""
633
634
#: bzrlib/builtins.py:1336
635
msgid "Could not determine branch to refer to."
636
msgstr ""
637
638
#: bzrlib/builtins.py:1345
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:1351 bzrlib/foreign.py:306
646
msgid "No push location known or specified."
647
msgstr ""
648
649
#: bzrlib/builtins.py:1355
650
#, python-format
651
msgid "Using saved push location: %s"
652
msgstr ""
653
654
#: bzrlib/builtins.py:1365
655
msgid "Create a new branch that is a copy of an existing branch."
656
msgstr ""
657
658
#: bzrlib/builtins.py:1367
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:1374
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:1377
676
msgid "The synonyms 'clone' and 'get' for this command are deprecated."
677
msgstr ""
678
679
#: bzrlib/builtins.py:1387
680
msgid "Create a branch without a working-tree."
681
msgstr ""
682
683
#: bzrlib/builtins.py:1389
684
msgid "Switch the checkout in the current directory to the new branch."
685
msgstr ""
686
687
#: bzrlib/builtins.py:1392
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:1396
694
msgid "Do not use a shared repository, even if available."
695
msgstr ""
696
697
#: bzrlib/builtins.py:1398
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:1403
704
msgid "Bind new branch to from location."
705
msgstr ""
706
707
#: bzrlib/builtins.py:1450
708
#, python-format
709
msgid "Target directory \"%s\" already exists."
710
msgstr ""
711
712
#: bzrlib/builtins.py:1462
713
#, python-format
714
msgid "Parent of \"%s\" does not exist."
715
msgstr ""
716
717
#: bzrlib/builtins.py:1481
718
msgid "The branch {0} has no revision {1}."
719
msgstr ""
720
721
#: bzrlib/builtins.py:1496 bzrlib/push.py:53
722
#, python-format
723
msgid "Created new stacked branch referring to %s."
724
msgstr ""
725
726
#: bzrlib/builtins.py:1500
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:1505
734
#, python-format
735
msgid "New branch bound to %s"
736
msgstr ""
737
738
#: bzrlib/builtins.py:1510 bzrlib/builtins.py:6256
739
#, python-format
740
msgid "Switched to branch: %s"
741
msgstr ""
742
743
#: bzrlib/builtins.py:1515
744
msgid "List the branches available at the current location."
745
msgstr ""
746
747
#: bzrlib/builtins.py:1517
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:1524
754
msgid ""
755
"Recursively scan for branches rather than just looking in the specified "
756
"location."
757
msgstr ""
758
759
#: bzrlib/builtins.py:1554
760
msgid "(default)"
761
msgstr ""
762
763
#: bzrlib/builtins.py:1566
764
msgid "Create a new checkout of an existing branch."
765
msgstr ""
766
767
#: bzrlib/builtins.py:1568
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:1573
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:1580
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:1590
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:1597
808
msgid "Get file contents from this tree."
809
msgstr ""
810
811
#: bzrlib/builtins.py:1599
812
msgid "Hard-link working tree files where possible."
813
msgstr ""
814
815
#: bzrlib/builtins.py:1640
816
msgid ""
817
"Show list of renamed files.\n"
818
" "
819
msgstr ""
820
821
#: bzrlib/builtins.py:1670
822
msgid "Update a working tree to a new revision."
823
msgstr ""
824
825
#: bzrlib/builtins.py:1672
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:1676
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:1679
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:1684
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:1687
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:1694
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:1710
870
msgid "bzr update --revision takes exactly one revision"
871
msgstr ""
872
873
#: bzrlib/builtins.py:1718
874
msgid "bzr update can only update a whole tree, not a file or subdirectory"
875
msgstr ""
876
877
#: bzrlib/builtins.py:1749
878
msgid "Tree is up to date at revision {0} of branch {1}"
879
msgstr ""
880
881
#: bzrlib/builtins.py:1765
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:1771
889
msgid "Updated to revision {0} of branch {1}"
890
msgstr ""
891
892
#: bzrlib/builtins.py:1775
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:1784
899
msgid "Show information about a working tree, branch or repository."
900
msgstr ""
901
902
#: bzrlib/builtins.py:1786
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:1789
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:1793
916
msgid "Branches and working trees will also report any missing revisions."
917
msgstr ""
918
919
#: bzrlib/builtins.py:1795 bzrlib/builtins.py:3715 bzrlib/builtins.py:4845
920
#: bzrlib/builtins.py:6442
921
msgid ":Examples:"
922
msgstr ""
923
924
#: bzrlib/builtins.py:1797
925
msgid " Display information on the format and related locations:"
926
msgstr ""
927
928
#: bzrlib/builtins.py:1799
929
msgid " bzr info"
930
msgstr ""
931
932
#: bzrlib/builtins.py:1801
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:1805
940
msgid " bzr info -v"
941
msgstr ""
942
943
#: bzrlib/builtins.py:1807
944
msgid " Display the above together with number of committers to the branch:"
945
msgstr ""
946
947
#: bzrlib/builtins.py:1809
948
msgid " bzr info -vv"
949
msgstr ""
950
951
#: bzrlib/builtins.py:1828
952
msgid "Remove files or directories."
953
msgstr ""
954
955
#: bzrlib/builtins.py:1830
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:1838
965
msgid "Only remove files that have never been committed."
966
msgstr ""
967
968
#: bzrlib/builtins.py:1840
969
msgid "The file deletion mode to be used."
970
msgstr ""
971
972
#: bzrlib/builtins.py:1841
973
msgid "Deletion Strategy"
974
msgstr ""
975
976
#: bzrlib/builtins.py:1842
977
msgid "Backup changed files (default)."
978
msgstr ""
979
980
#: bzrlib/builtins.py:1843
981
msgid "Delete from bzr but leave the working copy."
982
msgstr ""
983
984
#: bzrlib/builtins.py:1844
985
msgid "Don't backup changed files."
986
msgstr ""
987
988
#: bzrlib/builtins.py:1845
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:1854
995
msgid "(The --force option is deprecated, rather use --no-backup in future.)"
996
msgstr ""
997
998
#: bzrlib/builtins.py:1871
999
msgid "No matching files."
1000
msgstr ""
1001
1002
#: bzrlib/builtins.py:1932
1003
msgid "Reconcile bzr metadata in a branch."
1004
msgstr ""
1005
1006
#: bzrlib/builtins.py:1934
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:1939
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:1944
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:1947
1029
msgid "The branch *MUST* be on a listable system such as local disk or sftp."
1030
msgstr ""
1031
1032
#: bzrlib/builtins.py:2014 bzrlib/builtins.py:2132 bzrlib/builtins.py:3750
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:2014 bzrlib/builtins.py:2132 bzrlib/builtins.py:3750
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:2014 bzrlib/builtins.py:2132 bzrlib/builtins.py:3750
1046
msgid "The 2a format with experimental support for colocated branches.\n"
1047
msgstr ""
1048
1049
#: bzrlib/builtins.py:2015
1050
msgid "Make a directory into a versioned branch."
1051
msgstr ""
1052
1053
#: bzrlib/builtins.py:2017
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:2020
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:2025
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:2028
1074
msgid "Recipe for importing a tree of files::"
1075
msgstr ""
1076
1077
#: bzrlib/builtins.py:2030
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:2041
1087
msgid ""
1088
"Create the path leading up to the branch if it does not already exist."
1089
msgstr ""
1090
1091
#: bzrlib/builtins.py:2044
1092
msgid "Specify a format for this branch. See \"help formats\"."
1093
msgstr ""
1094
1095
#: bzrlib/builtins.py:2052
1096
msgid ""
1097
"Never change revnos or the existing log. Append revisions to it only."
1098
msgstr ""
1099
1100
#: bzrlib/builtins.py:2055
1101
msgid "Create a branch without a working tree."
1102
msgstr ""
1103
1104
#: bzrlib/builtins.py:2075 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:2109
1112
msgid ""
1113
"This branch format cannot be set to append-revisions-only. Try --default."
1114
msgstr ""
1115
1116
#: bzrlib/builtins.py:2120
1117
msgid "Created a {0} (format: {1})\n"
1118
msgstr ""
1119
1120
#: bzrlib/builtins.py:2129
1121
#, python-format
1122
msgid "Using shared repository: %s\n"
1123
msgstr ""
1124
1125
#: bzrlib/builtins.py:2133
1126
msgid "Create a shared repository for branches to share storage space."
1127
msgstr ""
1128
1129
#: bzrlib/builtins.py:2135
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:2140
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:2147
1148
msgid ""
1149
":Examples:\n"
1150
" Create a shared repository holding just branches::"
1151
msgstr ""
1152
1153
#: bzrlib/builtins.py:2150
1154
msgid ""
1155
" bzr init-repo --no-trees repo\n"
1156
" bzr init repo/trunk"
1157
msgstr ""
1158
1159
#: bzrlib/builtins.py:2153
1160
msgid " Make a lightweight checkout elsewhere::"
1161
msgstr ""
1162
1163
#: bzrlib/builtins.py:2155
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:2163
1171
msgid ""
1172
"Specify a format for this repository. See \"bzr help formats\" for details."
1173
msgstr ""
1174
1175
#: bzrlib/builtins.py:2167
1176
msgid "Repository format"
1177
msgstr ""
1178
1179
#: bzrlib/builtins.py:2169
1180
msgid "Branches in the repository will default to not having a working tree."
1181
msgstr ""
1182
1183
#: bzrlib/builtins.py:2195
1184
msgid "Show differences in the working tree, between revisions or branches."
1185
msgstr ""
1186
1187
#: bzrlib/builtins.py:2197
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:2204
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:2207
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:2214
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:2220
1223
msgid ""
1224
":Examples:\n"
1225
" Shows the difference in the working tree versus the last commit::"
1226
msgstr ""
1227
1228
#: bzrlib/builtins.py:2223
1229
msgid " bzr diff"
1230
msgstr ""
1231
1232
#: bzrlib/builtins.py:2225
1233
msgid " Difference between the working tree and revision 1::"
1234
msgstr ""
1235
1236
#: bzrlib/builtins.py:2227
1237
msgid " bzr diff -r1"
1238
msgstr ""
1239
1240
#: bzrlib/builtins.py:2229
1241
msgid " Difference between revision 3 and revision 1::"
1242
msgstr ""
1243
1244
#: bzrlib/builtins.py:2231
1245
msgid " bzr diff -r1..3"
1246
msgstr ""
1247
1248
#: bzrlib/builtins.py:2233
1249
msgid " Difference between revision 3 and revision 1 for branch xxx::"
1250
msgstr ""
1251
1252
#: bzrlib/builtins.py:2235
1253
msgid " bzr diff -r1..3 xxx"
1254
msgstr ""
1255
1256
#: bzrlib/builtins.py:2237
1257
msgid " The changes introduced by revision 2 (equivalent to -r1..2)::"
1258
msgstr ""
1259
1260
#: bzrlib/builtins.py:2239
1261
msgid " bzr diff -c2"
1262
msgstr ""
1263
1264
#: bzrlib/builtins.py:2241
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:2245
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:2249
1279
msgid " bzr diff -r<chosen_parent>..X"
1280
msgstr ""
1281
1282
#: bzrlib/builtins.py:2251
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:2254
1289
msgid " bzr diff -r-2.."
1290
msgstr ""
1291
1292
#: bzrlib/builtins.py:2256
1293
msgid " Show just the differences for file NEWS::"
1294
msgstr ""
1295
1296
#: bzrlib/builtins.py:2258
1297
msgid " bzr diff NEWS"
1298
msgstr ""
1299
1300
#: bzrlib/builtins.py:2260
1301
msgid " Show the differences in working tree xxx for file NEWS::"
1302
msgstr ""
1303
1304
#: bzrlib/builtins.py:2262
1305
msgid " bzr diff xxx/NEWS"
1306
msgstr ""
1307
1308
#: bzrlib/builtins.py:2264
1309
msgid " Show the differences from branch xxx to this working tree:"
1310
msgstr ""
1311
1312
#: bzrlib/builtins.py:2266
1313
msgid " bzr diff --old xxx"
1314
msgstr ""
1315
1316
#: bzrlib/builtins.py:2268
1317
msgid " Show the differences between two branches for file NEWS::"
1318
msgstr ""
1319
1320
#: bzrlib/builtins.py:2270
1321
msgid " bzr diff --old xxx --new yyy NEWS"
1322
msgstr ""
1323
1324
#: bzrlib/builtins.py:2272
1325
msgid " Same as 'bzr diff' but prefix paths with old/ and new/::"
1326
msgstr ""
1327
1328
#: bzrlib/builtins.py:2274
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:2284
1338
msgid "Pass these options to the external diff program."
1339
msgstr ""
1340
1341
#: bzrlib/builtins.py:2287
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:2290
1348
msgid "Branch/tree to compare from."
1349
msgstr ""
1350
1351
#: bzrlib/builtins.py:2294
1352
msgid "Branch/tree to compare to."
1353
msgstr ""
1354
1355
#: bzrlib/builtins.py:2300
1356
msgid "Use this command to compare files."
1357
msgstr ""
1358
1359
#: bzrlib/builtins.py:2305
1360
msgid "Diff format to use."
1361
msgstr ""
1362
1363
#: bzrlib/builtins.py:2307
1364
msgid "Diff format"
1365
msgstr ""
1366
1367
#: bzrlib/builtins.py:2329
1368
msgid "--prefix expects two values separated by a colon (eg \"old/:new/\")"
1369
msgstr ""
1370
1371
#: bzrlib/builtins.py:2333
1372
msgid "bzr diff --revision takes exactly one or two revision specifiers"
1373
msgstr ""
1374
1375
#: bzrlib/builtins.py:2338 bzrlib/builtins.py:2736 bzrlib/builtins.py:2749
1376
#: bzrlib/builtins.py:2757 bzrlib/builtins.py:4919
1377
msgid "{0} and {1} are mutually exclusive"
1378
msgstr ""
1379
1380
#: bzrlib/builtins.py:2358
1381
msgid ""
1382
"List files deleted in the working tree.\n"
1383
" "
1384
msgstr ""
1385
1386
#: bzrlib/builtins.py:2436
1387
msgid "Show the tree root directory."
1388
msgstr ""
1389
1390
#: bzrlib/builtins.py:2438
1391
msgid ""
1392
"The root is the nearest enclosing directory with a .bzr control\n"
1393
"directory."
1394
msgstr ""
1395
1396
#: bzrlib/builtins.py:2453
1397
msgid "The limit argument must be an integer."
1398
msgstr ""
1399
1400
#: bzrlib/builtins.py:2461
1401
msgid "The levels argument must be an integer."
1402
msgstr ""
1403
1404
#: bzrlib/builtins.py:2466
1405
msgid "Show historical log for a branch or subset of a branch."
1406
msgstr ""
1407
1408
#: bzrlib/builtins.py:2468
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:2473
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:2477
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:2484
1434
msgid ":Output control:"
1435
msgstr ""
1436
1437
#: bzrlib/builtins.py:2486
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:2491
1446
msgid ""
1447
" The following options can be used to control what information is\n"
1448
" displayed::"
1449
msgstr ""
1450
1451
#: bzrlib/builtins.py:2494
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:2500
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:2504
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:2508
1475
msgid ":Ordering control:"
1476
msgstr ""
1477
1478
#: bzrlib/builtins.py:2510
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:2515
1487
msgid ":Revision filtering:"
1488
msgstr ""
1489
1490
#: bzrlib/builtins.py:2517
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:2520
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:2525
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:2528
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:2535
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:2542
1531
msgid ":Path filtering:"
1532
msgstr ""
1533
1534
#: bzrlib/builtins.py:2544
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:2548
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:2552
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:2555
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:2559
1562
msgid " In this case:"
1563
msgstr ""
1564
1565
#: bzrlib/builtins.py:2561
1566
msgid " * ``bzr log guide.txt`` will log the file added in revision 1"
1567
msgstr ""
1568
1569
#: bzrlib/builtins.py:2563
1570
msgid ""
1571
" * ``bzr log tutorial.txt`` will log the new file added in revision 3"
1572
msgstr ""
1573
1574
#: bzrlib/builtins.py:2565
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:2568
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:2571
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:2575
1594
msgid ":Other filtering:"
1595
msgstr ""
1596
1597
#: bzrlib/builtins.py:2577
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:2583
1607
msgid ":Tips & tricks:"
1608
msgstr ""
1609
1610
#: bzrlib/builtins.py:2585
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:2591
1620
msgid ""
1621
" You may find it useful to add the aliases below to ``bazaar.conf``::"
1622
msgstr ""
1623
1624
#: bzrlib/builtins.py:2593
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:2598
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:2602
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:2605
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:2610
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:2615
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:2624
1670
msgid "Show from oldest to newest."
1671
msgstr ""
1672
1673
#: bzrlib/builtins.py:2627
1674
msgid "Show files changed in each revision."
1675
msgstr ""
1676
1677
#: bzrlib/builtins.py:2633
1678
msgid "Show just the specified revision. See also \"help revisionspec\"."
1679
msgstr ""
1680
1681
#: bzrlib/builtins.py:2637
1682
msgid "What names to list as authors - first, all or committer."
1683
msgstr ""
1684
1685
#: bzrlib/builtins.py:2638
1686
msgid "Authors"
1687
msgstr ""
1688
1689
#: bzrlib/builtins.py:2643
1690
msgid "Number of levels to display - 0 for all, 1 for flat."
1691
msgstr ""
1692
1693
#: bzrlib/builtins.py:2653
1694
msgid "Limit the output to the first N revisions."
1695
msgstr ""
1696
1697
#: bzrlib/builtins.py:2658
1698
msgid "Show changes made in each revision as a patch."
1699
msgstr ""
1700
1701
#: bzrlib/builtins.py:2660
1702
msgid "Show merged revisions like --levels 0 does."
1703
msgstr ""
1704
1705
#: bzrlib/builtins.py:2664
1706
msgid "Do not report commits with more than one parent."
1707
msgstr ""
1708
1709
#: bzrlib/builtins.py:2666
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:2670
1716
msgid "Show digital signature validity."
1717
msgstr ""
1718
1719
#: bzrlib/builtins.py:2673
1720
msgid "Show revisions whose properties match this expression."
1721
msgstr ""
1722
1723
#: bzrlib/builtins.py:2677
1724
msgid "Show revisions whose message matches this expression."
1725
msgstr ""
1726
1727
#: bzrlib/builtins.py:2681
1728
msgid "Show revisions whose committer matches this expression."
1729
msgstr ""
1730
1731
#: bzrlib/builtins.py:2685
1732
msgid "Show revisions whose authors match this expression."
1733
msgstr ""
1734
1735
#: bzrlib/builtins.py:2689
1736
msgid "Show revisions whose bugs match this expression."
1737
msgstr ""
1738
1739
#: bzrlib/builtins.py:2743
1740
msgid "--exclude-common-ancestry requires -r with two revisions"
1741
msgstr ""
1742
1743
#: bzrlib/builtins.py:2771
1744
#, python-format
1745
msgid "Path unknown at end or start of revision range: %s"
1746
msgstr ""
1747
1748
#: bzrlib/builtins.py:2888
1749
#, python-format
1750
msgid "bzr %s doesn't accept two revisions in different branches."
1751
msgstr ""
1752
1753
#: bzrlib/builtins.py:2904
1754
#, python-format
1755
msgid "bzr %s --revision takes one or two values."
1756
msgstr ""
1757
1758
#: bzrlib/builtins.py:2949
1759
msgid ""
1760
"List files in a tree.\n"
1761
" "
1762
msgstr ""
1763
1764
#: bzrlib/builtins.py:2958
1765
msgid "Recurse into subdirectories."
1766
msgstr ""
1767
1768
#: bzrlib/builtins.py:2960
1769
msgid "Print paths relative to the root of the branch."
1770
msgstr ""
1771
1772
#: bzrlib/builtins.py:2962
1773
msgid "Print unknown files."
1774
msgstr ""
1775
1776
#: bzrlib/builtins.py:2963
1777
msgid "Print versioned files."
1778
msgstr ""
1779
1780
#: bzrlib/builtins.py:2966
1781
msgid "Print ignored files."
1782
msgstr ""
1783
1784
#: bzrlib/builtins.py:2968
1785
msgid "List entries of a particular kind: file, directory, symlink."
1786
msgstr ""
1787
1788
#: bzrlib/builtins.py:2981
1789
msgid "invalid kind specified"
1790
msgstr ""
1791
1792
#: bzrlib/builtins.py:2984
1793
msgid "Cannot set both --verbose and --null"
1794
msgstr ""
1795
1796
#: bzrlib/builtins.py:2993
1797
msgid "cannot specify both --from-root and PATH"
1798
msgstr ""
1799
1800
#: bzrlib/builtins.py:3080
1801
msgid "Ignore specified files or patterns."
1802
msgstr ""
1803
1804
#: bzrlib/builtins.py:3082
1805
msgid "See ``bzr help patterns`` for details on the syntax of patterns."
1806
msgstr ""
1807
1808
#: bzrlib/builtins.py:3084
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:3090
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:3095
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:3101
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:3105
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:3108
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:3113
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:3116
1862
msgid ""
1863
":Examples:\n"
1864
" Ignore the top level Makefile::"
1865
msgstr ""
1866
1867
#: bzrlib/builtins.py:3119
1868
msgid " bzr ignore ./Makefile"
1869
msgstr ""
1870
1871
#: bzrlib/builtins.py:3121
1872
msgid " Ignore .class files in all directories...::"
1873
msgstr ""
1874
1875
#: bzrlib/builtins.py:3123
1876
msgid " bzr ignore \"*.class\""
1877
msgstr ""
1878
1879
#: bzrlib/builtins.py:3125
1880
msgid " ...but do not ignore \"special.class\"::"
1881
msgstr ""
1882
1883
#: bzrlib/builtins.py:3127
1884
msgid " bzr ignore \"!special.class\""
1885
msgstr ""
1886
1887
#: bzrlib/builtins.py:3129
1888
msgid " Ignore files whose name begins with the \"#\" character::"
1889
msgstr ""
1890
1891
#: bzrlib/builtins.py:3131
1892
msgid " bzr ignore \"RE:^#\""
1893
msgstr ""
1894
1895
#: bzrlib/builtins.py:3133 bzrlib/builtins.py:3137
1896
msgid " Ignore .o files under the lib directory::"
1897
msgstr ""
1898
1899
#: bzrlib/builtins.py:3135
1900
msgid " bzr ignore \"lib/**/*.o\""
1901
msgstr ""
1902
1903
#: bzrlib/builtins.py:3139
1904
msgid " bzr ignore \"RE:lib/.*\\.o\""
1905
msgstr ""
1906
1907
#: bzrlib/builtins.py:3141
1908
msgid " Ignore everything but the \"debian\" toplevel directory::"
1909
msgstr ""
1910
1911
#: bzrlib/builtins.py:3143
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:3157
1924
msgid "Display the default ignore rules that bzr uses."
1925
msgstr ""
1926
1927
#: bzrlib/builtins.py:3169
1928
msgid "ignore requires at least one NAME_PATTERN or --default-rules."
1929
msgstr ""
1930
1931
#: bzrlib/builtins.py:3180
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:3189
1939
msgid "NAME_PATTERN should not be an absolute path"
1940
msgstr ""
1941
1942
#: bzrlib/builtins.py:3202
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:3209
1953
msgid "List ignored files and the patterns that matched them."
1954
msgstr ""
1955
1956
#: bzrlib/builtins.py:3211
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:3214
1963
msgid "Alternatively, to list just the files::"
1964
msgstr ""
1965
1966
#: bzrlib/builtins.py:3216
1967
msgid " bzr ls --ignored"
1968
msgstr ""
1969
1970
#: bzrlib/builtins.py:3250
1971
#, python-format
1972
msgid "not a valid revision-number: %r"
1973
msgstr ""
1974
1975
#: bzrlib/builtins.py:3257
1976
msgid ""
1977
"Export current or past revision to a destination directory or archive."
1978
msgstr ""
1979
1980
#: bzrlib/builtins.py:3259
1981
msgid "If no revision is specified this exports the last committed revision."
1982
msgstr ""
1983
1984
#: bzrlib/builtins.py:3261
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:3265
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:3269
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:3272
2005
msgid ""
2006
"Note: Export of tree with non-ASCII filenames to zip is not supported."
2007
msgstr ""
2008
2009
#: bzrlib/builtins.py:3274
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:3288
2023
msgid "Type of file to export to."
2024
msgstr ""
2025
2026
#: bzrlib/builtins.py:3291
2027
msgid "Apply content filters to export the convenient form."
2028
msgstr ""
2029
2030
#: bzrlib/builtins.py:3295
2031
msgid "Name of the root directory inside the exported file."
2032
msgstr ""
2033
2034
#: bzrlib/builtins.py:3297
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:3300
2041
msgid ""
2042
"Export the working tree contents rather than that of the last revision."
2043
msgstr ""
2044
2045
#: bzrlib/builtins.py:3319
2046
msgid "--uncommitted requires a working tree"
2047
msgstr ""
2048
2049
#: bzrlib/builtins.py:3328
2050
#, python-format
2051
msgid "Unsupported export format: %s"
2052
msgstr ""
2053
2054
#: bzrlib/builtins.py:3332
2055
msgid ""
2056
"Write the contents of a file as of a given revision to standard output."
2057
msgstr ""
2058
2059
#: bzrlib/builtins.py:3334
2060
msgid "If no revision is nominated, the last revision is used."
2061
msgstr ""
2062
2063
#: bzrlib/builtins.py:3336
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:3342
2070
msgid "The path name in the old tree."
2071
msgstr ""
2072
2073
#: bzrlib/builtins.py:3343
2074
msgid "Apply content filters to display the convenience form."
2075
msgstr ""
2076
2077
#: bzrlib/builtins.py:3354
2078
msgid "bzr cat --revision takes exactly one revision specifier"
2079
msgstr ""
2080
2081
#: bzrlib/builtins.py:3379 bzrlib/builtins.py:3391
2082
msgid "{0!r} is not present in revision {1}"
2083
msgstr ""
2084
2085
#: bzrlib/builtins.py:3414
2086
msgid "Commit changes into a new revision."
2087
msgstr ""
2088
2089
#: bzrlib/builtins.py:3416
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:3423
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:3427
2107
msgid ":Selective commits:"
2108
msgstr ""
2109
2110
#: bzrlib/builtins.py:3429
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:3433
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:3437
2125
msgid " bzr commit foo -x foo/bar"
2126
msgstr ""
2127
2128
#: bzrlib/builtins.py:3439
2129
msgid " A selective commit after a merge is not yet supported."
2130
msgstr ""
2131
2132
#: bzrlib/builtins.py:3441
2133
msgid ":Custom authors:"
2134
msgstr ""
2135
2136
#: bzrlib/builtins.py:3443
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:3450
2147
msgid ":Checks:"
2148
msgstr ""
2149
2150
#: bzrlib/builtins.py:3452
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:3458
2160
msgid ":Things to note:"
2161
msgstr ""
2162
2163
#: bzrlib/builtins.py:3460
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:3464
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:3474
2179
msgid "Do not consider changes made to a given path."
2180
msgstr ""
2181
2182
#: bzrlib/builtins.py:3477
2183
msgid "Description of the new revision."
2184
msgstr ""
2185
2186
#: bzrlib/builtins.py:3480
2187
msgid "Commit even if nothing has changed."
2188
msgstr ""
2189
2190
#: bzrlib/builtins.py:3484
2191
msgid "Take commit message from this file."
2192
msgstr ""
2193
2194
#: bzrlib/builtins.py:3486
2195
msgid "Refuse to commit if there are unknown files in the working tree."
2196
msgstr ""
2197
2198
#: bzrlib/builtins.py:3489
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:3492
2205
msgid "Mark a bug as being fixed by this revision (see \"bzr help bugs\")."
2206
msgstr ""
2207
2208
#: bzrlib/builtins.py:3495
2209
msgid "Set the author's name, if it's different from the committer."
2210
msgstr ""
2211
2212
#: bzrlib/builtins.py:3498
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:3504
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:3507
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:3525
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:3534
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:3543
2247
#, python-format
2248
msgid "Unrecognized bug %s. Commit refused."
2249
msgstr ""
2250
2251
#: bzrlib/builtins.py:3546
2252
#, python-format
2253
msgid ""
2254
"%s\n"
2255
"Commit refused."
2256
msgstr ""
2257
2258
#: bzrlib/builtins.py:3570
2259
msgid "Could not parse --commit-time: "
2260
msgstr ""
2261
2262
#: bzrlib/builtins.py:3610
2263
msgid "please specify either --message or --file"
2264
msgstr ""
2265
2266
#: bzrlib/builtins.py:3639
2267
msgid "please specify a commit message with either --message or --file"
2268
msgstr ""
2269
2270
#: bzrlib/builtins.py:3642
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:3662
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:3666
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:3670
2289
msgid "Commit refused because there are unknown files in the working tree."
2290
msgstr ""
2291
2292
#: bzrlib/builtins.py:3673
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:3681
2300
msgid ""
2301
"Validate working tree structure, branch consistency and repository history."
2302
msgstr ""
2303
2304
#: bzrlib/builtins.py:3683
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:3686
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:3689
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:3693
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:3697
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:3702
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:3706
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:3712
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:3717
2362
msgid " Check the tree and branch at 'foo'::"
2363
msgstr ""
2364
2365
#: bzrlib/builtins.py:3719
2366
msgid " bzr check --tree --branch foo"
2367
msgstr ""
2368
2369
#: bzrlib/builtins.py:3721
2370
msgid " Check only the repository at 'bar'::"
2371
msgstr ""
2372
2373
#: bzrlib/builtins.py:3723
2374
msgid " bzr check --repo bar"
2375
msgstr ""
2376
2377
#: bzrlib/builtins.py:3725
2378
msgid " Check everything at 'baz'::"
2379
msgstr ""
2380
2381
#: bzrlib/builtins.py:3727
2382
msgid " bzr check baz"
2383
msgstr ""
2384
2385
#: bzrlib/builtins.py:3733
2386
msgid "Check the branch related to the current directory."
2387
msgstr ""
2388
2389
#: bzrlib/builtins.py:3735
2390
msgid "Check the repository related to the current directory."
2391
msgstr ""
2392
2393
#: bzrlib/builtins.py:3737
2394
msgid "Check the working tree related to the current directory."
2395
msgstr ""
2396
2397
#: bzrlib/builtins.py:3751
2398
msgid "Upgrade a repository, branch or working tree to a newer format."
2399
msgstr ""
2400
2401
#: bzrlib/builtins.py:3753
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:3759
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:3766
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:3774
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:3779
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:3787
2446
msgid "Upgrade to a specific format. See \"bzr help formats\" for details."
2447
msgstr ""
2448
2449
#: bzrlib/builtins.py:3791
2450
msgid "Branch format"
2451
msgstr ""
2452
2453
#: bzrlib/builtins.py:3793
2454
msgid "Remove the backup.bzr directory if successful."
2455
msgstr ""
2456
2457
#: bzrlib/builtins.py:3795
2458
msgid "Show what would be done, but don't actually do anything."
2459
msgstr ""
2460
2461
#: bzrlib/builtins.py:3810
2462
msgid "Show or set bzr user id."
2463
msgstr ""
2464
2465
#: bzrlib/builtins.py:3812
2466
msgid ""
2467
":Examples:\n"
2468
" Show the email of the current user::"
2469
msgstr ""
2470
2471
#: bzrlib/builtins.py:3815
2472
msgid " bzr whoami --email"
2473
msgstr ""
2474
2475
#: bzrlib/builtins.py:3817
2476
msgid " Set the current user::"
2477
msgstr ""
2478
2479
#: bzrlib/builtins.py:3819
2480
msgid " bzr whoami \"Frank Chu <fchu@example.com>\""
2481
msgstr ""
2482
2483
#: bzrlib/builtins.py:3823
2484
msgid "Display email address only."
2485
msgstr ""
2486
2487
#: bzrlib/builtins.py:3825
2488
msgid "Set identity for the current branch instead of globally."
2489
msgstr ""
2490
2491
#: bzrlib/builtins.py:3851
2492
msgid "--email can only be used to display existing identity"
2493
msgstr ""
2494
2495
#: bzrlib/builtins.py:3873
2496
msgid "Print or set the branch nickname."
2497
msgstr ""
2498
2499
#: bzrlib/builtins.py:3875
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:3878
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:3898
2512
msgid "Set/unset and display aliases."
2513
msgstr ""
2514
2515
#: bzrlib/builtins.py:3900
2516
msgid ""
2517
":Examples:\n"
2518
" Show the current aliases::"
2519
msgstr ""
2520
2521
#: bzrlib/builtins.py:3903
2522
msgid " bzr alias"
2523
msgstr ""
2524
2525
#: bzrlib/builtins.py:3905
2526
msgid " Show the alias specified for 'll'::"
2527
msgstr ""
2528
2529
#: bzrlib/builtins.py:3907
2530
msgid " bzr alias ll"
2531
msgstr ""
2532
2533
#: bzrlib/builtins.py:3909
2534
msgid " Set an alias for 'll'::"
2535
msgstr ""
2536
2537
#: bzrlib/builtins.py:3911
2538
msgid " bzr alias ll=\"log --line -r-10..-1\""
2539
msgstr ""
2540
2541
#: bzrlib/builtins.py:3913
2542
msgid " To remove an alias for 'll'::"
2543
msgstr ""
2544
2545
#: bzrlib/builtins.py:3915
2546
msgid " bzr alias --remove ll"
2547
msgstr ""
2548
2549
#: bzrlib/builtins.py:3920
2550
msgid "Remove the alias."
2551
msgstr ""
2552
2553
#: bzrlib/builtins.py:3938
2554
msgid "bzr alias --remove expects an alias to remove."
2555
msgstr ""
2556
2557
#: bzrlib/builtins.py:4119
2558
msgid ""
2559
"subunit not available. subunit needs to be installed to use --subunit."
2560
msgstr ""
2561
2562
#: bzrlib/builtins.py:4136
2563
msgid ""
2564
"--benchmark is no longer supported from bzr 2.2; use bzr-usertest instead"
2565
msgstr ""
2566
2567
#: bzrlib/builtins.py:4183
2568
msgid "Show version of bzr."
2569
msgstr ""
2570
2571
#: bzrlib/builtins.py:4187
2572
msgid "Print just the version number."
2573
msgstr ""
2574
2575
#: bzrlib/builtins.py:4206
2576
msgid "It sure does!\n"
2577
msgstr ""
2578
2579
#: bzrlib/builtins.py:4230
2580
#, python-format
2581
msgid "merge base is revision %s\n"
2582
msgstr ""
2583
2584
#: bzrlib/builtins.py:4234
2585
msgid "Perform a three-way merge."
2586
msgstr ""
2587
2588
#: bzrlib/builtins.py:4236
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:4244
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:4248
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:4251
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:4259
2624
msgid "Revision numbers are always relative to the source branch."
2625
msgstr ""
2626
2627
#: bzrlib/builtins.py:4261 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 can commit."
2633
msgstr ""
2634
2635
#: bzrlib/builtins.py:4266
2636
msgid ""
2637
"Use bzr resolve when you have fixed a problem. See also bzr conflicts."
2638
msgstr ""
2639
2640
#: bzrlib/builtins.py:4268
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:4273
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:4277
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:4283
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:4287
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:4290
2678
msgid ""
2679
":Examples:\n"
2680
" To merge all new revisions from bzr.dev::"
2681
msgstr ""
2682
2683
#: bzrlib/builtins.py:4293
2684
msgid " bzr merge ../bzr.dev"
2685
msgstr ""
2686
2687
#: bzrlib/builtins.py:4295
2688
msgid " To merge changes up to and including revision 82 from bzr.dev::"
2689
msgstr ""
2690
2691
#: bzrlib/builtins.py:4297
2692
msgid " bzr merge -r 82 ../bzr.dev"
2693
msgstr ""
2694
2695
#: bzrlib/builtins.py:4299
2696
msgid " To merge the changes introduced by 82, without previous changes::"
2697
msgstr ""
2698
2699
#: bzrlib/builtins.py:4301
2700
msgid " bzr merge -r 81..82 ../bzr.dev"
2701
msgstr ""
2702
2703
#: bzrlib/builtins.py:4303
2704
msgid " To apply a merge directive contained in /tmp/merge::"
2705
msgstr ""
2706
2707
#: bzrlib/builtins.py:4305
2708
msgid " bzr merge /tmp/merge"
2709
msgstr ""
2710
2711
#: bzrlib/builtins.py:4307
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:4310
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:4322
2725
msgid "Merge even if the destination tree has uncommitted changes."
2726
msgstr ""
2727
2728
#: bzrlib/builtins.py:4328
2729
msgid ""
2730
"Apply uncommitted changes from a working copy, instead of branch changes."
2731
msgstr ""
2732
2733
#: bzrlib/builtins.py:4330
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:4335
2741
msgid ""
2742
"Branch to merge into, rather than the one containing the working directory."
2743
msgstr ""
2744
2745
#: bzrlib/builtins.py:4337
2746
msgid "Instead of merging, show a diff of the merge."
2747
msgstr ""
2748
2749
#: bzrlib/builtins.py:4339
2750
msgid "Select changes interactively."
2751
msgstr ""
2752
2753
#: bzrlib/builtins.py:4361
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:4388
2760
msgid "Cannot use --uncommitted with bundles or merge directives."
2761
msgstr ""
2762
2763
#: bzrlib/builtins.py:4399
2764
msgid "Cannot use --uncommitted and --revision at the same time."
2765
msgstr ""
2766
2767
#: bzrlib/builtins.py:4419
2768
msgid "merger: "
2769
msgstr ""
2770
2771
#: bzrlib/builtins.py:4421 bzrlib/bundle/apply_bundle.py:71
2772
msgid "Nothing to do."
2773
msgstr ""
2774
2775
#: bzrlib/builtins.py:4425
2776
msgid "Cannot pull individual files"
2777
msgstr ""
2778
2779
#: bzrlib/builtins.py:4433
2780
msgid "This branch has no commits. (perhaps you would prefer 'bzr pull')"
2781
msgstr ""
2782
2783
#: bzrlib/builtins.py:4491
2784
#, python-format
2785
msgid "Show-base is not supported for this merge type. %s"
2786
msgstr ""
2787
2788
#: bzrlib/builtins.py:4500
2789
#, python-format
2790
msgid "Conflict reduction is not supported for merge type %s."
2791
msgstr ""
2792
2793
#: bzrlib/builtins.py:4504
2794
msgid "Cannot do conflict reduction and show base."
2795
msgstr ""
2796
2797
#: bzrlib/builtins.py:4615
2798
msgid "No location specified or remembered"
2799
msgstr ""
2800
2801
#: bzrlib/builtins.py:4617
2802
msgid "{0} remembered {1} location {2}"
2803
msgstr ""
2804
2805
#: bzrlib/builtins.py:4623
2806
msgid "Redo a merge."
2807
msgstr ""
2808
2809
#: bzrlib/builtins.py:4625
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:4629
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:4633
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:4637
2831
msgid " bzr remerge --show-base"
2832
msgstr ""
2833
2834
#: bzrlib/builtins.py:4639
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:4642
2841
msgid " bzr remerge --merge-type weave --reprocess foobar"
2842
msgstr ""
2843
2844
#: bzrlib/builtins.py:4649
2845
msgid "Show base revision text in conflicts."
2846
msgstr ""
2847
2848
#: bzrlib/builtins.py:4661
2849
msgid ""
2850
"Sorry, remerge only works after normal merges. Not cherrypicking or multi-"
2851
"merges."
2852
msgstr ""
2853
2854
#: bzrlib/builtins.py:4717
2855
msgid "Revert files to a previous revision."
2856
msgstr ""
2857
2858
#: bzrlib/builtins.py:4719
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:4723
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:4729
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:4733
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:4738
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:4743
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:4752
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:4766
2924
msgid "Do not save backups of reverted files."
2925
msgstr ""
2926
2927
#: bzrlib/builtins.py:4768
2928
msgid "Remove pending merge marker, without changing any files."
2929
msgstr ""
2930
2931
#: bzrlib/builtins.py:4799
2932
msgid ""
2933
"Show help on a command or other topic.\n"
2934
" "
2935
msgstr ""
2936
2937
#: bzrlib/builtins.py:4804
2938
msgid "Show help on all commands."
2939
msgstr ""
2940
2941
#: bzrlib/builtins.py:4833
2942
msgid "Show unmerged/unpulled revisions between two branches."
2943
msgstr ""
2944
2945
#: bzrlib/builtins.py:4835
2946
msgid "OTHER_BRANCH may be local or remote."
2947
msgstr ""
2948
2949
#: bzrlib/builtins.py:4837
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:4847
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:4850
2967
msgid " bzr missing"
2968
msgstr ""
2969
2970
#: bzrlib/builtins.py:4852
2971
msgid " Determine the missing revisions between this and another branch::"
2972
msgstr ""
2973
2974
#: bzrlib/builtins.py:4854
2975
msgid " bzr missing http://server/branch"
2976
msgstr ""
2977
2978
#: bzrlib/builtins.py:4856
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:4859
2985
msgid " bzr missing -r ..-10"
2986
msgstr ""
2987
2988
#: bzrlib/builtins.py:4861
2989
msgid ""
2990
" Determine the missing revisions up to a specific revision on this\n"
2991
" branch::"
2992
msgstr ""
2993
2994
#: bzrlib/builtins.py:4864
2995
msgid " bzr missing --my-revision ..-10"
2996
msgstr ""
2997
2998
#: bzrlib/builtins.py:4871
2999
msgid "Reverse the order of revisions."
3000
msgstr ""
3001
3002
#: bzrlib/builtins.py:4873
3003
msgid "Display changes in the local branch only."
3004
msgstr ""
3005
3006
#: bzrlib/builtins.py:4874
3007
msgid "Same as --mine-only."
3008
msgstr ""
3009
3010
#: bzrlib/builtins.py:4876
3011
msgid "Display changes in the remote branch only."
3012
msgstr ""
3013
3014
#: bzrlib/builtins.py:4877
3015
msgid "Same as --theirs-only."
3016
msgstr ""
3017
3018
#: bzrlib/builtins.py:4882
3019
msgid ""
3020
"Filter on other branch revisions (inclusive). See \"help revisionspec\" for "
3021
"details."
3022
msgstr ""
3023
3024
#: bzrlib/builtins.py:4886
3025
msgid ""
3026
"Filter on local branch revisions (inclusive). See \"help revisionspec\" for "
3027
"details."
3028
msgstr ""
3029
3030
#: bzrlib/builtins.py:4889
3031
msgid "Show all revisions in addition to the mainline ones."
3032
msgstr ""
3033
3034
#: bzrlib/builtins.py:4943
3035
msgid "No peer location known or specified."
3036
msgstr ""
3037
3038
#: bzrlib/builtins.py:4947
3039
msgid "Using saved parent location: {0}\n"
3040
msgstr ""
3041
3042
#: bzrlib/builtins.py:4980
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:4996
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:5008
3057
msgid "This branch has no new revisions.\n"
3058
msgstr ""
3059
3060
#: bzrlib/builtins.py:5011
3061
msgid "Other branch has no new revisions.\n"
3062
msgstr ""
3063
3064
#: bzrlib/builtins.py:5016
3065
msgid "Branches are up to date.\n"
3066
msgstr ""
3067
3068
#: bzrlib/builtins.py:5027
3069
msgid "Compress the data within a repository."
3070
msgstr ""
3071
3072
#: bzrlib/builtins.py:5029
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:5033
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:5039
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:5048
3097
msgid "Delete obsolete packs to save disk space."
3098
msgstr ""
3099
3100
#: bzrlib/builtins.py:5062
3101
msgid "List the installed plugins."
3102
msgstr ""
3103
3104
#: bzrlib/builtins.py:5064
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:5067
3111
msgid "--verbose shows the path where each plugin is located."
3112
msgstr ""
3113
3114
#: bzrlib/builtins.py:5069
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:5075
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:5091
3132
msgid "Show testament (signing-form) of a revision."
3133
msgstr ""
3134
3135
#: bzrlib/builtins.py:5094
3136
msgid "Produce long-format testament."
3137
msgstr ""
3138
3139
#: bzrlib/builtins.py:5096
3140
msgid "Produce a strict-format testament."
3141
msgstr ""
3142
3143
#: bzrlib/builtins.py:5122
3144
msgid "Show the origin of each line in a file."
3145
msgstr ""
3146
3147
#: bzrlib/builtins.py:5124
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:5127
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:5135
3160
msgid "Show annotations on all lines."
3161
msgstr ""
3162
3163
#: bzrlib/builtins.py:5136
3164
msgid "Show commit date in annotations."
3165
msgstr ""
3166
3167
#: bzrlib/builtins.py:5223
3168
msgid "Cannot sign a range of non-revision-history revisions"
3169
msgstr ""
3170
3171
#: bzrlib/builtins.py:5235
3172
msgid "Please supply either one revision, or a range."
3173
msgstr ""
3174
3175
#: bzrlib/builtins.py:5239
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:5242
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:5245
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:5260
3195
msgid "No location supplied. This format does not remember old locations."
3196
msgstr ""
3197
3198
#: bzrlib/builtins.py:5265
3199
msgid "Branch is already bound"
3200
msgstr ""
3201
3202
#: bzrlib/builtins.py:5267
3203
msgid "No location supplied and no previous location known"
3204
msgstr ""
3205
3206
#: bzrlib/builtins.py:5273
3207
msgid "These branches have diverged. Try merging, and then bind again."
3208
msgstr ""
3209
3210
#: bzrlib/builtins.py:5280
3211
msgid "Convert the current checkout into a regular branch."
3212
msgstr ""
3213
3214
#: bzrlib/builtins.py:5282
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:5293
3221
msgid "Local branch is not bound"
3222
msgstr ""
3223
3224
#: bzrlib/builtins.py:5297
3225
msgid "Remove the last committed revision."
3226
msgstr ""
3227
3228
#: bzrlib/builtins.py:5299
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:5303
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:5307
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:5318
3250
msgid "Don't actually make changes."
3251
msgstr ""
3252
3253
#: bzrlib/builtins.py:5319
3254
msgid "Say yes to all questions."
3255
msgstr ""
3256
3257
#: bzrlib/builtins.py:5321
3258
msgid "Keep tags that point to removed revisions."
3259
msgstr ""
3260
3261
#: bzrlib/builtins.py:5323
3262
msgid "Only remove the commits from the local branch when in a checkout."
3263
msgstr ""
3264
3265
#: bzrlib/builtins.py:5372
3266
msgid "No revisions to uncommit.\n"
3267
msgstr ""
3268
3269
#: bzrlib/builtins.py:5387
3270
msgid "Dry-run, pretending to remove the above revisions.\n"
3271
msgstr ""
3272
3273
#: bzrlib/builtins.py:5390
3274
msgid "The above revision(s) will be removed.\n"
3275
msgstr ""
3276
3277
#: bzrlib/builtins.py:5394
3278
msgid "Uncommit these revisions"
3279
msgstr ""
3280
3281
#: bzrlib/builtins.py:5397
3282
msgid "Canceled\n"
3283
msgstr ""
3284
3285
#: bzrlib/builtins.py:5404
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:5409
3293
msgid "Break a dead lock."
3294
msgstr ""
3295
3296
#: bzrlib/builtins.py:5411
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:5414
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:5417
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:5420
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:5429
3323
msgid "LOCATION is the directory where the config lock is."
3324
msgstr ""
3325
3326
#: bzrlib/builtins.py:5431
3327
msgid "Do not ask for confirmation before breaking the lock."
3328
msgstr ""
3329
3330
#: bzrlib/builtins.py:5466
3331
msgid "The Bazaar smart server protocol over TCP. (default port: 4155)"
3332
msgstr ""
3333
3334
#: bzrlib/builtins.py:5467
3335
msgid "Run the bzr server."
3336
msgstr ""
3337
3338
#: bzrlib/builtins.py:5473
3339
msgid "Serve on stdin/out for use from inetd or sshd."
3340
msgstr ""
3341
3342
#: bzrlib/builtins.py:5474
3343
msgid "protocol"
3344
msgstr ""
3345
3346
#: bzrlib/builtins.py:5475
3347
msgid "Protocol to serve."
3348
msgstr ""
3349
3350
#: bzrlib/builtins.py:5479
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:5485
3358
msgid "Serve contents of this directory."
3359
msgstr ""
3360
3361
#: bzrlib/builtins.py:5487
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:5496
3371
msgid "Override the default idle client timeout (5min)."
3372
msgstr ""
3373
3374
#: bzrlib/builtins.py:5546
3375
msgid "Combine a tree into its containing tree."
3376
msgstr ""
3377
3378
#: bzrlib/builtins.py:5548
3379
msgid "This command requires the target tree to be in a rich-root format."
3380
msgstr ""
3381
3382
#: bzrlib/builtins.py:5550
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:5554
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:5572
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:5582 bzrlib/builtins.py:5588
3404
msgid "Cannot join {0}. {1}"
3405
msgstr ""
3406
3407
#: bzrlib/builtins.py:5592
3408
msgid "Split a subdirectory of a tree into a separate tree."
3409
msgstr ""
3410
3411
#: bzrlib/builtins.py:5594
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:5598
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:5678
3426
msgid "No submit branch specified or known"
3427
msgstr ""
3428
3429
#: bzrlib/builtins.py:5686 bzrlib/send.py:108
3430
msgid "No public branch specified or known"
3431
msgstr ""
3432
3433
#: bzrlib/builtins.py:5691
3434
msgid "bzr merge-directive takes at most two one revision identifiers"
3435
msgstr ""
3436
3437
#: bzrlib/builtins.py:5700
3438
msgid "No revisions to bundle."
3439
msgstr ""
3440
3441
#: bzrlib/builtins.py:5719
3442
msgid "Mail or create a merge-directive for submitting changes."
3443
msgstr ""
3444
3445
#: bzrlib/builtins.py:5721
3446
msgid "A merge directive provides many things needed for requesting merges:"
3447
msgstr ""
3448
3449
#: bzrlib/builtins.py:5723
3450
msgid "* A machine-readable description of the merge to perform"
3451
msgstr ""
3452
3453
#: bzrlib/builtins.py:5725
3454
msgid "* An optional patch that is a preview of the changes requested"
3455
msgstr ""
3456
3457
#: bzrlib/builtins.py:5727
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:5731
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:5734
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:5738
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:5744
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:5750
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:5756
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:5761
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:5764
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:5768
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:5775
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:5780
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:5786
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:5789
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:5813
3570
msgid "Write merge directive to this file or directory; use - for stdout."
3571
msgstr ""
3572
3573
#: bzrlib/builtins.py:5817
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:5819
3580
msgid "Mail the request to this address."
3581
msgstr ""
3582
3583
#: bzrlib/builtins.py:5823
3584
msgid "Body for the email."
3585
msgstr ""
3586
3587
#: bzrlib/builtins.py:5876
3588
msgid "Do not include a bundle in the merge directive."
3589
msgstr ""
3590
3591
#: bzrlib/builtins.py:5877
3592
msgid "Do not include a preview patch in the merge directive."
3593
msgstr ""
3594
3595
#: bzrlib/builtins.py:5880
3596
msgid "Remember submit and public branch."
3597
msgstr ""
3598
3599
#: bzrlib/builtins.py:5882
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:5892 bzrlib/cmd_version_info.py:76
3606
msgid "format"
3607
msgstr ""
3608
3609
#: bzrlib/builtins.py:5893
3610
msgid "Use the specified output format."
3611
msgstr ""
3612
3613
#: bzrlib/builtins.py:5915
3614
msgid "Create, remove or modify a tag naming a revision."
3615
msgstr ""
3616
3617
#: bzrlib/builtins.py:5917
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:5921
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:5924
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:5927
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:5930
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:5940
3652
msgid "Delete this tag rather than placing it."
3653
msgstr ""
3654
3655
#: bzrlib/builtins.py:5943
3656
msgid "Branch in which to place the tag."
3657
msgstr ""
3658
3659
#: bzrlib/builtins.py:5945
3660
msgid "Replace existing tags."
3661
msgstr ""
3662
3663
#: bzrlib/builtins.py:5960
3664
msgid "No tag specified to delete."
3665
msgstr ""
3666
3667
#: bzrlib/builtins.py:5962
3668
#, python-format
3669
msgid "Deleted tag %s."
3670
msgstr ""
3671
3672
#: bzrlib/builtins.py:5976
3673
msgid "Please specify a tag name."
3674
msgstr ""
3675
3676
#: bzrlib/builtins.py:5984
3677
#, python-format
3678
msgid "Tag %s already exists for that revision."
3679
msgstr ""
3680
3681
#: bzrlib/builtins.py:5988
3682
#, python-format
3683
msgid "Created tag %s."
3684
msgstr ""
3685
3686
#: bzrlib/builtins.py:5990
3687
#, python-format
3688
msgid "Updated tag %s."
3689
msgstr ""
3690
3691
#: bzrlib/builtins.py:5994
3692
msgid "List tags."
3693
msgstr ""
3694
3695
#: bzrlib/builtins.py:5996
3696
msgid ""
3697
"This command shows a table of tag names and the revisions they reference."
3698
msgstr ""
3699
3700
#: bzrlib/builtins.py:6002
3701
msgid "Branch whose tags should be displayed."
3702
msgstr ""
3703
3704
#: bzrlib/builtins.py:6004
3705
msgid "Sort tags by different criteria."
3706
msgstr ""
3707
3708
#: bzrlib/builtins.py:6004
3709
msgid "Sorting"
3710
msgstr ""
3711
3712
#: bzrlib/builtins.py:6073
3713
msgid "Reconfigure the type of a bzr directory."
3714
msgstr ""
3715
3716
#: bzrlib/builtins.py:6075
3717
msgid "A target configuration must be specified."
3718
msgstr ""
3719
3720
#: bzrlib/builtins.py:6077
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:6091
3732
msgid "Tree type"
3733
msgstr ""
3734
3735
#: bzrlib/builtins.py:6092
3736
msgid "The relation between branch and tree."
3737
msgstr ""
3738
3739
#: bzrlib/builtins.py:6094
3740
msgid "Reconfigure to be an unbound branch with no working tree."
3741
msgstr ""
3742
3743
#: bzrlib/builtins.py:6095
3744
msgid "Reconfigure to be an unbound branch with a working tree."
3745
msgstr ""
3746
3747
#: bzrlib/builtins.py:6096
3748
msgid "Reconfigure to be a bound branch with a working tree."
3749
msgstr ""
3750
3751
#: bzrlib/builtins.py:6097
3752
msgid "Reconfigure to be a lightweight checkout (with no local history)."
3753
msgstr ""
3754
3755
#: bzrlib/builtins.py:6102
3756
msgid "Repository type"
3757
msgstr ""
3758
3759
#: bzrlib/builtins.py:6103
3760
msgid "Location fo the repository."
3761
msgstr ""
3762
3763
#: bzrlib/builtins.py:6105
3764
msgid ""
3765
"Reconfigure to be a standalone branch (i.e. stop using shared repository)."
3766
msgstr ""
3767
3768
#: bzrlib/builtins.py:6107
3769
msgid "Reconfigure to use a shared repository."
3770
msgstr ""
3771
3772
#: bzrlib/builtins.py:6111
3773
msgid "Trees in Repository"
3774
msgstr ""
3775
3776
#: bzrlib/builtins.py:6112
3777
msgid "Whether new branches in the repository have trees."
3778
msgstr ""
3779
3780
#: bzrlib/builtins.py:6114
3781
msgid ""
3782
"Reconfigure repository to create working trees on branches by default."
3783
msgstr ""
3784
3785
#: bzrlib/builtins.py:6116
3786
msgid ""
3787
"Reconfigure repository to not create working trees on branches by default."
3788
msgstr ""
3789
3790
#: bzrlib/builtins.py:6119
3791
msgid "Branch to bind checkout to."
3792
msgstr ""
3793
3794
#: bzrlib/builtins.py:6121
3795
msgid "Perform reconfiguration even if local changes will be lost."
3796
msgstr ""
3797
3798
#: bzrlib/builtins.py:6124
3799
msgid "Reconfigure a branch to be stacked on another branch."
3800
msgstr ""
3801
3802
#: bzrlib/builtins.py:6128
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:6138
3809
msgid "Can't use both --stacked-on and --unstacked"
3810
msgstr ""
3811
3812
#: bzrlib/builtins.py:6152
3813
msgid "No target configuration specified"
3814
msgstr ""
3815
3816
#: bzrlib/builtins.py:6187
3817
msgid "Set the branch of a checkout and update."
3818
msgstr ""
3819
3820
#: bzrlib/builtins.py:6189
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:6194
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:6197
3835
msgid "Pending merges need to be committed or reverted before using switch."
3836
msgstr ""
3837
3838
#: bzrlib/builtins.py:6199
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:6204
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:6212
3854
msgid "Switch even if local commits will be lost."
3855
msgstr ""
3856
3857
#: bzrlib/builtins.py:6215
3858
msgid "Create the target branch from this one before switching to it."
3859
msgstr ""
3860
3861
#: bzrlib/builtins.py:6229
3862
msgid "You must supply either a revision or a location"
3863
msgstr ""
3864
3865
#: bzrlib/builtins.py:6242
3866
msgid "cannot create branch without source branch"
3867
msgstr ""
3868
3869
#: bzrlib/builtins.py:6262
3870
msgid "Manage filtered views."
3871
msgstr ""
3872
3873
#: bzrlib/builtins.py:6264
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:6271
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:6276
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:6281
3900
msgid ""
3901
":Examples:\n"
3902
" To define the current view::"
3903
msgstr ""
3904
3905
#: bzrlib/builtins.py:6284
3906
msgid " bzr view file1 dir1 ..."
3907
msgstr ""
3908
3909
#: bzrlib/builtins.py:6286
3910
msgid " To list the current view::"
3911
msgstr ""
3912
3913
#: bzrlib/builtins.py:6288
3914
msgid " bzr view"
3915
msgstr ""
3916
3917
#: bzrlib/builtins.py:6290
3918
msgid " To delete the current view::"
3919
msgstr ""
3920
3921
#: bzrlib/builtins.py:6292
3922
msgid " bzr view --delete"
3923
msgstr ""
3924
3925
#: bzrlib/builtins.py:6294
3926
msgid " To disable the current view without deleting it::"
3927
msgstr ""
3928
3929
#: bzrlib/builtins.py:6296
3930
msgid " bzr view --switch off"
3931
msgstr ""
3932
3933
#: bzrlib/builtins.py:6298
3934
msgid " To define a named view and switch to it::"
3935
msgstr ""
3936
3937
#: bzrlib/builtins.py:6300
3938
msgid " bzr view --name view-name file1 dir1 ..."
3939
msgstr ""
3940
3941
#: bzrlib/builtins.py:6302
3942
msgid " To list a named view::"
3943
msgstr ""
3944
3945
#: bzrlib/builtins.py:6304
3946
msgid " bzr view --name view-name"
3947
msgstr ""
3948
3949
#: bzrlib/builtins.py:6306
3950
msgid " To delete a named view::"
3951
msgstr ""
3952
3953
#: bzrlib/builtins.py:6308
3954
msgid " bzr view --name view-name --delete"
3955
msgstr ""
3956
3957
#: bzrlib/builtins.py:6310
3958
msgid " To switch to a named view::"
3959
msgstr ""
3960
3961
#: bzrlib/builtins.py:6312
3962
msgid " bzr view --switch view-name"
3963
msgstr ""
3964
3965
#: bzrlib/builtins.py:6314
3966
msgid " To list all views defined::"
3967
msgstr ""
3968
3969
#: bzrlib/builtins.py:6316
3970
msgid " bzr view --all"
3971
msgstr ""
3972
3973
#: bzrlib/builtins.py:6318
3974
msgid " To delete all views::"
3975
msgstr ""
3976
3977
#: bzrlib/builtins.py:6320
3978
msgid " bzr view --delete --all"
3979
msgstr ""
3980
3981
#: bzrlib/builtins.py:6327
3982
msgid "Apply list or delete action to all views."
3983
msgstr ""
3984
3985
#: bzrlib/builtins.py:6330
3986
msgid "Delete the view."
3987
msgstr ""
3988
3989
#: bzrlib/builtins.py:6333
3990
msgid "Name of the view to define, list or delete."
3991
msgstr ""
3992
3993
#: bzrlib/builtins.py:6337
3994
msgid "Name of the view to switch to."
3995
msgstr ""
3996
3997
#: bzrlib/builtins.py:6356
3998
msgid "Both --delete and a file list specified"
3999
msgstr ""
4000
4001
#: bzrlib/builtins.py:6359
4002
msgid "Both --delete and --switch specified"
4003
msgstr ""
4004
4005
#: bzrlib/builtins.py:6362
4006
msgid "Deleted all views.\n"
4007
msgstr ""
4008
4009
#: bzrlib/builtins.py:6364
4010
msgid "No current view to delete"
4011
msgstr ""
4012
4013
#: bzrlib/builtins.py:6367
4014
#, python-format
4015
msgid "Deleted '%s' view.\n"
4016
msgstr ""
4017
4018
#: bzrlib/builtins.py:6371
4019
msgid "Both --switch and a file list specified"
4020
msgstr ""
4021
4022
#: bzrlib/builtins.py:6374
4023
msgid "Both --switch and --all specified"
4024
msgstr ""
4025
4026
#: bzrlib/builtins.py:6377
4027
msgid "No current view to disable"
4028
msgstr ""
4029
4030
#: bzrlib/builtins.py:6379
4031
#, python-format
4032
msgid "Disabled '%s' view.\n"
4033
msgstr ""
4034
4035
#: bzrlib/builtins.py:6383 bzrlib/builtins.py:6405
4036
msgid "Using '{0}' view: {1}\n"
4037
msgstr ""
4038
4039
#: bzrlib/builtins.py:6386
4040
msgid "Views defined:\n"
4041
msgstr ""
4042
4043
#: bzrlib/builtins.py:6395
4044
msgid "No views defined.\n"
4045
msgstr ""
4046
4047
#: bzrlib/builtins.py:6402
4048
msgid "Cannot change the 'off' pseudo view"
4049
msgstr ""
4050
4051
#: bzrlib/builtins.py:6410
4052
msgid "No current view.\n"
4053
msgstr ""
4054
4055
#: bzrlib/builtins.py:6413
4056
msgid "'{0}' view is: {1}\n"
4057
msgstr ""
4058
4059
#: bzrlib/builtins.py:6433
4060
msgid " <no hooks installed>\n"
4061
msgstr ""
4062
4063
#: bzrlib/builtins.py:6437
4064
msgid "Remove a branch."
4065
msgstr ""
4066
4067
#: bzrlib/builtins.py:6439
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:6444
4074
msgid " Remove the branch at repo/trunk::"
4075
msgstr ""
4076
4077
#: bzrlib/builtins.py:6446
4078
msgid " bzr remove-branch repo/trunk"
4079
msgstr ""
4080
4081
#: bzrlib/builtins.py:6461
4082
msgid "Plaintext diff output."
4083
msgstr ""
4084
4085
#: bzrlib/builtins.py:6462
4086
msgid "Temporarily set aside some changes from the current tree."
4087
msgstr ""
4088
4089
#: bzrlib/builtins.py:6464
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:6470
4099
msgid "If shelve --list is specified, previously-shelved changes are listed."
4100
msgstr ""
4101
4102
#: bzrlib/builtins.py:6472
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:6477
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:6480
4117
msgid ""
4118
"If a revision is specified, changes since that revision will be shelved."
4119
msgstr ""
4120
4121
#: bzrlib/builtins.py:6482
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:6485
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:6489
4135
msgid " change_editor = PROGRAM @new_path @old_path"
4136
msgstr ""
4137
4138
#: bzrlib/builtins.py:6491
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:6503
4148
msgid "Shelve all changes."
4149
msgstr ""
4150
4151
#: bzrlib/builtins.py:6505
4152
msgid "Method to use for writing diffs."
4153
msgstr ""
4154
4155
#: bzrlib/builtins.py:6505
4156
msgid "writer"
4157
msgstr ""
4158
4159
#: bzrlib/builtins.py:6509
4160
msgid "List shelved changes."
4161
msgstr ""
4162
4163
#: bzrlib/builtins.py:6511
4164
msgid "Destroy removed changes instead of shelving them."
4165
msgstr ""
4166
4167
#: bzrlib/builtins.py:6540
4168
msgid "No shelved changes."
4169
msgstr ""
4170
4171
#: bzrlib/builtins.py:6551
4172
msgid "Restore shelved changes."
4173
msgstr ""
4174
4175
#: bzrlib/builtins.py:6553
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:6562
4183
msgid "The action to perform."
4184
msgstr ""
4185
4186
#: bzrlib/builtins.py:6562 bzrlib/conflicts.py:694
4187
msgid "action"
4188
msgstr ""
4189
4190
#: bzrlib/builtins.py:6564
4191
msgid "Apply changes and remove from the shelf."
4192
msgstr ""
4193
4194
#: bzrlib/builtins.py:6565
4195
msgid "Show changes, but do not apply or remove them."
4196
msgstr ""
4197
4198
#: bzrlib/builtins.py:6566
4199
msgid ""
4200
"Instead of unshelving the changes, show the diff that would result from "
4201
"unshelving."
4202
msgstr ""
4203
4204
#: bzrlib/builtins.py:6568
4205
msgid "Delete changes without applying them."
4206
msgstr ""
4207
4208
#: bzrlib/builtins.py:6569
4209
msgid "Apply changes but don't delete them."
4210
msgstr ""
4211
4212
#: bzrlib/builtins.py:6584
4213
msgid "Remove unwanted files from working tree."
4214
msgstr ""
4215
4216
#: bzrlib/builtins.py:6586
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:6589
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:6593
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:6596
4236
msgid "To check what clean-tree will do, use --dry-run."
4237
msgstr ""
4238
4239
#: bzrlib/builtins.py:6599
4240
msgid "Delete all ignored files."
4241
msgstr ""
4242
4243
#: bzrlib/builtins.py:6600
4244
msgid ""
4245
"Delete conflict files, merge and revert backups, and failed selftest dirs."
4246
msgstr ""
4247
4248
#: bzrlib/builtins.py:6603
4249
msgid "Delete files unknown to bzr (default)."
4250
msgstr ""
4251
4252
#: bzrlib/builtins.py:6604
4253
msgid "Show files to delete instead of deleting them."
4254
msgstr ""
4255
4256
#: bzrlib/builtins.py:6606
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:490
4317
msgid ""
4318
"making backup of {0}\n"
4319
" to {1}"
4320
msgstr ""
4321
4322
#: bzrlib/bzrdir.py:513
4323
msgid "renamed {0} to {1}"
4324
msgstr ""
4325
4326
#: bzrlib/bzrdir.py:1652
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:1672
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:1818
4341
msgid "starting repository conversion"
4342
msgstr ""
4343
4344
#: bzrlib/bzrdir.py:2039
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:229
4584
#, python-format
4585
msgid "unknown command \"%s\""
4586
msgstr ""
4587
4588
#: bzrlib/commands.py:476
4589
msgid "No help for this command."
4590
msgstr ""
4591
4592
#: bzrlib/commands.py:489
4593
#, python-format
4594
msgid ":Purpose: %s\n"
4595
msgstr ""
4596
4597
#: bzrlib/commands.py:491
4598
#, python-format
4599
msgid ""
4600
":Usage:\n"
4601
"%s\n"
4602
msgstr ""
4603
4604
#: bzrlib/commands.py:493
4605
#, python-format
4606
msgid ":Usage: %s\n"
4607
msgstr ""
4608
4609
#: bzrlib/commands.py:512
4610
#, python-format
4611
msgid ":Options:%s"
4612
msgstr ""
4613
4614
#: bzrlib/commands.py:523
4615
#, python-format
4616
msgid ""
4617
":Description:\n"
4618
" %s\n"
4619
"\n"
4620
msgstr ""
4621
4622
#: bzrlib/commands.py:533
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:538
4630
msgid ":Aliases: "
4631
msgstr ""
4632
4633
#: bzrlib/commands.py:542
4634
#, python-format
4635
msgid ":From: plugin \"%s\"\n"
4636
msgstr ""
4637
4638
#: bzrlib/commands.py:554
4639
msgid ":doc:`{0} <{1}-help>`"
4640
msgstr ""
4641
4642
#: bzrlib/commands.py:558
4643
#, python-format
4644
msgid ":See also: %s"
4645
msgstr ""
4646
4647
#: bzrlib/commands.py:816 bzrlib/gpg.py:324
4648
msgid "Only ASCII permitted in option names"
4649
msgstr ""
4650
4651
#: bzrlib/commands.py:841 bzrlib/commands.py:849
4652
msgid "command {0!r} needs one or more {1}"
4653
msgstr ""
4654
4655
#: bzrlib/commands.py:858
4656
msgid "command {0!r} requires argument {1}"
4657
msgstr ""
4658
4659
#: bzrlib/commands.py:865
4660
msgid "extra argument to command {0}: {1}"
4661
msgstr ""
4662
4663
#: bzrlib/commands.py:962
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:2485
4766
msgid "{0} is not an SI unit."
4767
msgstr ""
4768
4769
#: bzrlib/config.py:2949
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:3093
4776
#, python-format
4777
msgid "Invalid '%s', should be of the form 'name=value'"
4778
msgstr ""
4779
4780
#: bzrlib/config.py:3962
4781
msgid "Display, set or remove a configuration option."
4782
msgstr ""
4783
4784
#: bzrlib/config.py:3964
4785
msgid "Display the active value for a given option."
4786
msgstr ""
4787
4788
#: bzrlib/config.py:3966
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:3970
4796
msgid "If no NAME is given, --all .* is implied."
4797
msgstr ""
4798
4799
#: bzrlib/config.py:3972
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:3984
4807
msgid "Reduce the scope to the specified configuration file."
4808
msgstr ""
4809
4810
#: bzrlib/config.py:3988
4811
msgid "Display all the defined values for the matching options."
4812
msgstr ""
4813
4814
#: bzrlib/config.py:3990
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:710
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:424
5001
msgid "Bad value \"%(value)s\" for option \"%(name)s\"."
5002
msgstr ""
5003
5004
#: bzrlib/errors.py:443
5005
msgid "Generic path error: %(path)r%(extra)s)"
5006
msgstr ""
5007
5008
#: bzrlib/errors.py:456
5009
msgid "No such file: %(path)r%(extra)s"
5010
msgstr ""
5011
5012
#: bzrlib/errors.py:461
5013
msgid "File exists: %(path)r%(extra)s"
5014
msgstr ""
5015
5016
#: bzrlib/errors.py:467
5017
msgid ""
5018
"Could not rename %(source)s => %(dest)s because both files exist. (Use --"
5019
"after to tell bzr about a rename that has already happened)%(extra)s"
5020
msgstr ""
5021
5022
#: bzrlib/errors.py:483
5023
msgid "\"%(path)s\" is not a directory %(extra)s"
5024
msgstr ""
5025
5026
#: bzrlib/errors.py:488
5027
msgid "\"%(path)s\" is not in the working directory %(extra)s"
5028
msgstr ""
5029
5030
#: bzrlib/errors.py:493
5031
msgid "Directory not empty: \"%(path)s\"%(extra)s"
5032
msgstr ""
5033
5034
#: bzrlib/errors.py:498
5035
msgid "Hard-linking \"%(path)s\" is not supported"
5036
msgstr ""
5037
5038
#: bzrlib/errors.py:513
5039
msgid "Device or resource busy: \"%(path)s\"%(extra)s"
5040
msgstr ""
5041
5042
#: bzrlib/errors.py:518
5043
msgid "Permission denied: \"%(path)s\"%(extra)s"
5044
msgstr ""
5045
5046
#: bzrlib/errors.py:523
5047
msgid "Invalid url supplied to transport: \"%(path)s\"%(extra)s"
5048
msgstr ""
5049
5050
#: bzrlib/errors.py:528
5051
msgid "Invalid URL join request: %(reason)s: %(base)r + %(join_args)r"
5052
msgstr ""
5053
5054
#: bzrlib/errors.py:539
5055
msgid "URLs differ by more than path: %(from_)r and %(to)r"
5056
msgstr ""
5057
5058
#: bzrlib/errors.py:561
5059
msgid "The %(type)s hook '%(hook)s' is unknown in this version of bzrlib."
5060
msgstr ""
5061
5062
#: bzrlib/errors.py:571
5063
msgid "Unsupported protocol for url \"%(path)s\"%(extra)s"
5064
msgstr ""
5065
5066
#: bzrlib/errors.py:579
5067
msgid ""
5068
"The branch '%(url)s'(%(format)s) is not a stackable format. You will need to "
5069
"upgrade the branch to permit branch stacking."
5070
msgstr ""
5071
5072
#: bzrlib/errors.py:590
5073
msgid "The branch '%(branch_url)s' cannot be stacked on '%(target_url)s'."
5074
msgstr ""
5075
5076
#: bzrlib/errors.py:600
5077
msgid ""
5078
"The repository '%(url)s'(%(format)s) is not a stackable format. You will "
5079
"need to upgrade the repository to permit branch stacking."
5080
msgstr ""
5081
5082
#: bzrlib/errors.py:611
5083
msgid "Error reading from %(path)r."
5084
msgstr ""
5085
5086
#: bzrlib/errors.py:630
5087
msgid "Path \"%(path)s\" is not a child of path \"%(base)s\"%(extra)s"
5088
msgstr ""
5089
5090
#: bzrlib/errors.py:646
5091
msgid "Path \"%(path)s\" is not unicode normalized"
5092
msgstr ""
5093
5094
#: bzrlib/errors.py:654
5095
msgid "Not a branch: \"%(path)s\"%(detail)s."
5096
msgstr ""
5097
5098
#: bzrlib/errors.py:696
5099
msgid "No submit branch available for branch \"%(path)s\""
5100
msgstr ""
5101
5102
#: bzrlib/errors.py:705
5103
msgid "A control directory already exists: \"%(path)s\"."
5104
msgstr ""
5105
5106
#: bzrlib/errors.py:710
5107
msgid "Already a branch: \"%(path)s\"."
5108
msgstr ""
5109
5110
#: bzrlib/errors.py:715
5111
msgid "Parent branch already exists: \"%(path)s\"."
5112
msgstr ""
5113
5114
#: bzrlib/errors.py:721
5115
msgid ""
5116
"Directory contains a branch, but no working tree (use bzr checkout if you "
5117
"wish to build a working tree): \"%(path)s\""
5118
msgstr ""
5119
5120
#: bzrlib/errors.py:726
5121
msgid ""
5122
"\"%(function)s\" called on an AtomicFile after it was closed: \"%(path)s\""
5123
msgstr ""
5124
5125
#: bzrlib/errors.py:736
5126
msgid ""
5127
"Parent not accessible given base \"%(base)s\" and relative path \"%(path)s\""
5128
msgstr ""
5129
5130
#: bzrlib/errors.py:746
5131
msgid "No repository present: \"%(path)s\""
5132
msgstr ""
5133
5134
#: bzrlib/errors.py:753
5135
msgid ""
5136
"Unsupported branch format: %(format)s\n"
5137
"Please run 'bzr upgrade'"
5138
msgstr ""
5139
5140
#: bzrlib/errors.py:759
5141
msgid "Unknown %(kind)s format: %(format)r"
5142
msgstr ""
5143
5144
#: bzrlib/errors.py:768
5145
msgid "Format %(format)s is not compatible with .bzr version %(bzrdir)s."
5146
msgstr ""
5147
5148
#: bzrlib/errors.py:778
5149
msgid "Parse error on line %(lineno)d of %(format)s format: %(line)s"
5150
msgstr ""
5151
5152
#: bzrlib/errors.py:793
5153
msgid ""
5154
"%(target)s\n"
5155
"is not compatible with\n"
5156
"%(source)s\n"
5157
"%(details)s"
5158
msgstr ""
5159
5160
#: bzrlib/errors.py:809
5161
msgid "Revision is not compatible with %(repo_format)s"
5162
msgstr ""
5163
5164
#: bzrlib/errors.py:819
5165
msgid "%(context_info)s%(path)s is already versioned."
5166
msgstr ""
5167
5168
#: bzrlib/errors.py:840
5169
msgid "%(context_info)s%(path)s is not versioned."
5170
msgstr ""
5171
5172
#: bzrlib/errors.py:861
5173
msgid "Path(s) are not versioned: %(paths_as_string)s"
5174
msgstr ""
5175
5176
#: bzrlib/errors.py:872
5177
msgid "Path(s) do not exist: %(paths_as_string)s%(extra)s"
5178
msgstr ""
5179
5180
#: bzrlib/errors.py:891
5181
msgid "Cannot operate on \"%(filename)s\" of unsupported kind \"%(kind)s\""
5182
msgstr ""
5183
5184
#: bzrlib/errors.py:899
5185
msgid ""
5186
"Filename %(filename)r is not valid in your current filesystem encoding "
5187
"%(fs_encoding)s"
5188
msgstr ""
5189
5190
#: bzrlib/errors.py:910
5191
msgid "Cannot operate on \"%(filename)s\" because it is a control file"
5192
msgstr ""
5193
5194
#: bzrlib/errors.py:928
5195
msgid "The lock for '%(lock_description)s' is in use and cannot be broken."
5196
msgstr ""
5197
5198
#: bzrlib/errors.py:967
5199
msgid "Cannot lock %(lock)s: %(why)s"
5200
msgstr ""
5201
5202
#: bzrlib/errors.py:977
5203
msgid ""
5204
"A transaction related operation was attempted after the transaction finished."
5205
msgstr ""
5206
5207
#: bzrlib/errors.py:1004
5208
msgid "Cannot lock: transport is read only: %(transport)s"
5209
msgstr ""
5210
5211
#: bzrlib/errors.py:1012
5212
msgid "Could not acquire lock \"%(lock)s\": %(msg)s"
5213
msgstr ""
5214
5215
#: bzrlib/errors.py:1023
5216
msgid ""
5217
"Lock was broken while still open: %(lock)s - check storage consistency!"
5218
msgstr ""
5219
5220
#: bzrlib/errors.py:1034
5221
msgid ""
5222
"Lock was released and re-acquired before being broken: %(lock)s: held by "
5223
"%(holder)r, wanted to break %(target)r"
5224
msgstr ""
5225
5226
#: bzrlib/errors.py:1046
5227
msgid ""
5228
"Lock is apparently held, but corrupted: %(corruption_info)s\n"
5229
"Use 'bzr break-lock' to clear it"
5230
msgstr ""
5231
5232
#: bzrlib/errors.py:1059
5233
msgid "Lock not held: %(lock)s"
5234
msgstr ""
5235
5236
#: bzrlib/errors.py:1088
5237
msgid "No changes to commit"
5238
msgstr ""
5239
5240
#: bzrlib/errors.py:1093
5241
msgid ""
5242
"Selected-file commit of merges is not supported yet: files %(files_str)s"
5243
msgstr ""
5244
5245
#: bzrlib/errors.py:1103
5246
msgid ""
5247
"Excluding paths during commit is not supported by repository at "
5248
"%(repository)r."
5249
msgstr ""
5250
5251
#: bzrlib/errors.py:1112
5252
msgid ""
5253
"The specified commit message contains characters unsupported by the current "
5254
"encoding."
5255
msgstr ""
5256
5257
#: bzrlib/errors.py:1118
5258
msgid "Upgrade URL cannot work with readonly URLs."
5259
msgstr ""
5260
5261
#: bzrlib/errors.py:1123
5262
msgid "The branch format %(format)s is already at the most recent format."
5263
msgstr ""
5264
5265
#: bzrlib/errors.py:1146
5266
msgid "Option --change does not accept revision ranges"
5267
msgstr ""
5268
5269
#: bzrlib/errors.py:1151
5270
msgid "No namespace registered for string: %(spec)r"
5271
msgstr ""
5272
5273
#: bzrlib/errors.py:1170
5274
msgid ""
5275
"Requested revision: '%(spec)s' does not exist in branch: "
5276
"%(branch_url)s%(extra)s"
5277
msgstr ""
5278
5279
#: bzrlib/errors.py:1184
5280
msgid ""
5281
"Operation denied because it would change the main history, which is not "
5282
"permitted by the append_revisions_only setting on branch \"%(location)s\"."
5283
msgstr ""
5284
5285
#: bzrlib/errors.py:1195
5286
msgid ""
5287
"These branches have diverged. Use the missing command to see how.\n"
5288
"Use the merge command to reconcile them."
5289
msgstr ""
5290
5291
#: bzrlib/errors.py:1215
5292
msgid ""
5293
"Branches have no common ancestor, and no merge base revision was specified."
5294
msgstr ""
5295
5296
#: bzrlib/errors.py:1221
5297
msgid ""
5298
"Selected merge cannot perform reverse cherrypicks. Try merge3 or diff3."
5299
msgstr ""
5300
5301
#: bzrlib/errors.py:1227
5302
msgid "Revisions have no common ancestor: %(revision_a)s %(revision_b)s"
5303
msgstr ""
5304
5305
#: bzrlib/errors.py:1236
5306
msgid ""
5307
"Revisions are not derived from the same root: %(revision_a)s %(revision_b)s."
5308
msgstr ""
5309
5310
#: bzrlib/errors.py:1245
5311
msgid "Revision %(rev_id)s is not an ancestor of %(not_ancestor_id)s"
5312
msgstr ""
5313
5314
#: bzrlib/errors.py:1254
5315
msgid "Branch %(branch)s has no commits."
5316
msgstr ""
5317
5318
#: bzrlib/errors.py:1272
5319
msgid ""
5320
"Bound branch %(branch)s is out of date with master branch "
5321
"%(master)s.%(extra_help)s"
5322
msgstr ""
5323
5324
#: bzrlib/errors.py:1284
5325
msgid ""
5326
"Cannot commit to branch %(branch)s. It is bound to %(master)s, which is "
5327
"bound to %(remote)s."
5328
msgstr ""
5329
5330
#: bzrlib/errors.py:1296
5331
msgid "Cannot pull --overwrite to a branch which is bound %(branch)s"
5332
msgstr ""
5333
5334
#: bzrlib/errors.py:1305
5335
msgid ""
5336
"Unable to connect to target of bound branch %(branch)s => %(target)s: "
5337
"%(error)s"
5338
msgstr ""
5339
5340
#: bzrlib/errors.py:1317
5341
msgid "Error in processing weave: %(msg)s"
5342
msgstr ""
5343
5344
#: bzrlib/errors.py:1326
5345
msgid "Revision {%(revision_id)s} already present in %(weave)s"
5346
msgstr ""
5347
5348
#: bzrlib/errors.py:1337
5349
msgid "Revision {%(revision_id)s} not present in %(weave)s"
5350
msgstr ""
5351
5352
#: bzrlib/errors.py:1347
5353
msgid "Weave invariant violated: %(what)s"
5354
msgstr ""
5355
5356
#: bzrlib/errors.py:1356
5357
msgid "Parents are mismatched between two revisions. %(msg)s"
5358
msgstr ""
5359
5360
#: bzrlib/errors.py:1378
5361
msgid ""
5362
"Weaves differ on text content. Revision: {%(revision_id)s}, %(weave_a)s, "
5363
"%(weave_b)s"
5364
msgstr ""
5365
5366
#: bzrlib/errors.py:1390
5367
msgid "Versioned file error"
5368
msgstr ""
5369
5370
#: bzrlib/errors.py:1395
5371
msgid "Revision {%(revision_id)s} not present in \"%(file_id)s\"."
5372
msgstr ""
5373
5374
#: bzrlib/errors.py:1405
5375
msgid "Revision {%(revision_id)s} already present in \"%(file_id)s\"."
5376
msgstr ""
5377
5378
#: bzrlib/errors.py:1415
5379
msgid "Text did not match its checksum: %(msg)s"
5380
msgstr ""
5381
5382
#: bzrlib/errors.py:1541
5383
msgid "Export format %(format)r not supported"
5384
msgstr ""
5385
5386
#: bzrlib/errors.py:1550
5387
msgid "Transport error: %(msg)s %(orig_error)s"
5388
msgstr ""
5389
5390
#: bzrlib/errors.py:1576
5391
msgid "Generic bzr smart protocol error: %(details)s"
5392
msgstr ""
5393
5394
#: bzrlib/errors.py:1584
5395
msgid "Received bad protocol version marker: %(marker)r"
5396
msgstr ""
5397
5398
#: bzrlib/errors.py:1616
5399
msgid "Transport operation not possible: %(msg)s %(orig_error)s"
5400
msgstr ""
5401
5402
#: bzrlib/errors.py:1621
5403
msgid "Connection error: %(msg)s %(orig_error)s"
5404
msgstr ""
5405
5406
#: bzrlib/errors.py:1626
5407
msgid "%(msg)s %(host)s%(port)s%(orig_error)s"
5408
msgstr ""
5409
5410
#: bzrlib/errors.py:1647
5411
msgid "Connection closed: %(msg)s %(orig_error)s"
5412
msgstr ""
5413
5414
#: bzrlib/errors.py:1652
5415
msgid "Connection Timeout: %(msg)s%(orig_error)s"
5416
msgstr ""
5417
5418
#: bzrlib/errors.py:1657
5419
msgid "Invalid range access in %(path)s at %(offset)s: %(msg)s"
5420
msgstr ""
5421
5422
#: bzrlib/errors.py:1667
5423
msgid "Invalid http response for %(path)s: %(msg)s%(orig_error)s"
5424
msgstr ""
5425
5426
#: bzrlib/errors.py:1682
5427
msgid "Certificate error: %(error)s"
5428
msgstr ""
5429
5430
#: bzrlib/errors.py:1690
5431
msgid "Invalid http range %(range)r for %(path)s: %(msg)s"
5432
msgstr ""
5433
5434
#: bzrlib/errors.py:1704
5435
msgid "HTTP MIME Boundary missing for %(path)s: %(msg)s"
5436
msgstr ""
5437
5438
#: bzrlib/errors.py:1712
5439
msgid "Invalid http Content-type \"%(ctype)s\" for %(path)s: %(msg)s"
5440
msgstr ""
5441
5442
#: bzrlib/errors.py:1721
5443
msgid "%(source)s is%(permanently)s redirected to %(target)s"
5444
msgstr ""
5445
5446
#: bzrlib/errors.py:1735
5447
msgid "Too many redirections"
5448
msgstr ""
5449
5450
#: bzrlib/errors.py:1740
5451
msgid "Working tree has conflicts."
5452
msgstr ""
5453
5454
#: bzrlib/errors.py:1744
5455
msgid "Config file %(filename)s is not UTF-8 encoded\n"
5456
msgstr ""
5457
5458
#: bzrlib/errors.py:1753
5459
msgid ""
5460
"Error(s) parsing config file %(filename)s:\n"
5461
"%(errors)s"
5462
msgstr ""
5463
5464
#: bzrlib/errors.py:1763
5465
msgid ""
5466
"Bad value \"%(value)s\" for option \"%(name)s\".\n"
5467
"See ``bzr help %(name)s``"
5468
msgstr ""
5469
5470
#: bzrlib/errors.py:1773
5471
msgid "%(username)r does not seem to contain a reasonable email address"
5472
msgstr ""
5473
5474
#: bzrlib/errors.py:1782
5475
msgid "Failed to GPG sign data with command \"%(command_line)s\""
5476
msgstr ""
5477
5478
#: bzrlib/errors.py:1790
5479
msgid "Failed to verify GPG signature data with error \"%(error)s\""
5480
msgstr ""
5481
5482
#: bzrlib/errors.py:1798
5483
msgid "Unable to import library \"%(library)s\": %(error)s"
5484
msgstr ""
5485
5486
#: bzrlib/errors.py:1806
5487
msgid "python-gpgme is not installed, it is needed to verify signatures"
5488
msgstr ""
5489
5490
#: bzrlib/errors.py:1814
5491
msgid ""
5492
"The working tree for %(basedir)s has changed since the last commit, but "
5493
"weave merge requires that it be unchanged"
5494
msgstr ""
5495
5496
#: bzrlib/errors.py:1824
5497
msgid ""
5498
"Can't reprocess and show base, because reprocessing obscures the "
5499
"relationship of conflicting lines to the base"
5500
msgstr ""
5501
5502
#: bzrlib/errors.py:1830
5503
msgid "Cycle in graph %(graph)r"
5504
msgstr ""
5505
5506
#: bzrlib/errors.py:1858
5507
msgid "File %(filename)s is not conflicted."
5508
msgstr ""
5509
5510
#: bzrlib/errors.py:1880
5511
msgid "No bundle was found in \"%(filename)s\"."
5512
msgstr ""
5513
5514
#: bzrlib/errors.py:1889
5515
msgid "Unable to handle bundle version %(version)s: %(msg)s"
5516
msgstr ""
5517
5518
#: bzrlib/errors.py:1899
5519
msgid "Branch %(base)s is missing revision %(text_revision)s of %(file_id)s"
5520
msgstr ""
5521
5522
#: bzrlib/errors.py:1912
5523
msgid "File id {%(file_id)s} already exists in inventory as %(entry)s"
5524
msgstr ""
5525
5526
#: bzrlib/errors.py:1922
5527
msgid "Key %(key)s is already present in map"
5528
msgstr ""
5529
5530
#: bzrlib/errors.py:1927
5531
msgid "The prefix %(prefix)s is in the help search path twice."
5532
msgstr ""
5533
5534
#: bzrlib/errors.py:1937
5535
msgid ""
5536
"No final name for trans_id %(trans_id)r\n"
5537
"file-id: %(file_id)r\n"
5538
"root trans-id: %(root_trans_id)r\n"
5539
msgstr ""
5540
5541
#: bzrlib/errors.py:1969
5542
msgid "Attempt to reuse a transform that has already been applied."
5543
msgstr ""
5544
5545
#: bzrlib/errors.py:1974
5546
msgid "Moving the root directory is not supported at this time"
5547
msgstr ""
5548
5549
#: bzrlib/errors.py:1979
5550
msgid "Failed to rename %(from_path)s to %(to_path)s: %(why)s"
5551
msgstr ""
5552
5553
#: bzrlib/errors.py:1990
5554
msgid ""
5555
"Could not move %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s"
5556
msgstr ""
5557
5558
#: bzrlib/errors.py:2026
5559
msgid ""
5560
"Could not rename %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s"
5561
msgstr ""
5562
5563
#: bzrlib/errors.py:2056
5564
msgid "Unable to import paramiko (required for sftp support): %(error)s"
5565
msgstr ""
5566
5567
#: bzrlib/errors.py:2064
5568
msgid "Nothing to merge."
5569
msgstr ""
5570
5571
#: bzrlib/errors.py:2069
5572
msgid "Format %(format)s cannot be initialised by this version of bzr."
5573
msgstr ""
5574
5575
#: bzrlib/errors.py:2078
5576
msgid ""
5577
"Cannot convert from format %(from_format)s to format %(format)s. "
5578
"%(problem)s"
5579
msgstr ""
5580
5581
#: bzrlib/errors.py:2090
5582
msgid "Could not find an appropriate Differ for file \"%(path)s\""
5583
msgstr ""
5584
5585
#: bzrlib/errors.py:2098
5586
msgid "%(exe_name)s could not be found on this machine"
5587
msgstr ""
5588
5589
#: bzrlib/errors.py:2106
5590
msgid "Diff is not installed on this machine: %(msg)s"
5591
msgstr ""
5592
5593
#: bzrlib/errors.py:2114
5594
msgid "Diff3 is not installed on this machine."
5595
msgstr ""
5596
5597
#: bzrlib/errors.py:2120
5598
msgid "The content being inserted is already present."
5599
msgstr ""
5600
5601
#: bzrlib/errors.py:2125
5602
msgid ""
5603
"This tree contains left-over files from a failed operation.\n"
5604
" Please examine %(limbo_dir)s to see if it contains any files you wish "
5605
"to\n"
5606
" keep, and delete it when you are done."
5607
msgstr ""
5608
5609
#: bzrlib/errors.py:2136
5610
msgid ""
5611
"This tree contains left-over files from a failed operation.\n"
5612
" Please examine %(pending_deletion)s to see if it contains any files you\n"
5613
" wish to keep, and delete it when you are done."
5614
msgstr ""
5615
5616
#: bzrlib/errors.py:2146
5617
msgid ""
5618
"Unable to delete transform temporary directory %(limbo_dir)s.\n"
5619
" Please examine %(limbo_dir)s to see if it contains any files you wish "
5620
"to\n"
5621
" keep, and delete it when you are done."
5622
msgstr ""
5623
5624
#: bzrlib/errors.py:2157
5625
msgid ""
5626
"Unable to delete transform temporary directory %(pending_deletion)s. Please "
5627
"examine %(pending_deletion)s to see if it contains any files you wish to "
5628
"keep, and delete it when you are done."
5629
msgstr ""
5630
5631
#: bzrlib/errors.py:2167
5632
msgid "Working tree is out of date, please run 'bzr update'.%(more)s"
5633
msgstr ""
5634
5635
#: bzrlib/errors.py:2181
5636
msgid ""
5637
"Public branch \"%(public_location)s\" lacks revision \"%(revstring)s\"."
5638
msgstr ""
5639
5640
#: bzrlib/errors.py:2194
5641
msgid "Error in merge modified format"
5642
msgstr ""
5643
5644
#: bzrlib/errors.py:2199
5645
msgid "Format error in conflict listings"
5646
msgstr ""
5647
5648
#: bzrlib/errors.py:2203
5649
msgid ""
5650
"Inconsistency in dirstate file %(dirstate_path)s.\n"
5651
"Error: %(description)s"
5652
msgstr ""
5653
5654
#: bzrlib/errors.py:2214
5655
msgid ""
5656
"An error has been detected in the repository %(repo_path)s.\n"
5657
"Please run bzr reconcile on this repository."
5658
msgstr ""
5659
5660
#: bzrlib/errors.py:2225
5661
msgid ""
5662
"An inconsistent delta was supplied involving %(path)r, %(file_id)r\n"
5663
"reason: %(reason)s"
5664
msgstr ""
5665
5666
#: bzrlib/errors.py:2238
5667
msgid ""
5668
"An inconsistent delta was supplied: %(delta)r\n"
5669
"reason: %(reason)s"
5670
msgstr ""
5671
5672
#: bzrlib/errors.py:2250
5673
msgid "To use this feature you must upgrade your branch at %(path)s."
5674
msgstr ""
5675
5676
#: bzrlib/errors.py:2259
5677
msgid "To use this feature you must upgrade your repository at %(path)s."
5678
msgstr ""
5679
5680
#: bzrlib/errors.py:2264
5681
msgid ""
5682
"To use this feature you must upgrade your branch at %(path)s to a format "
5683
"which supports rich roots."
5684
msgstr ""
5685
5686
#: bzrlib/errors.py:2270
5687
msgid "Cannot perform local-only commits on unbound branches."
5688
msgstr ""
5689
5690
#: bzrlib/errors.py:2275
5691
msgid "The method %(mname)s is not supported on objects of type %(tname)s."
5692
msgstr ""
5693
5694
#: bzrlib/errors.py:2296
5695
msgid "Ghost tags not supported by format %(format)r."
5696
msgstr ""
5697
5698
#: bzrlib/errors.py:2304
5699
msgid "File is binary but should be text."
5700
msgstr ""
5701
5702
#: bzrlib/errors.py:2309
5703
msgid "The path %(path)s is not permitted on this platform"
5704
msgstr ""
5705
5706
#: bzrlib/errors.py:2318
5707
msgid ""
5708
"Testament did not match expected value.\n"
5709
" For revision_id {%(revision_id)s}, expected {%(expected)s}, measured\n"
5710
" {%(measured)s}"
5711
msgstr ""
5712
5713
#: bzrlib/errors.py:2330
5714
msgid "Not a bzr revision-bundle: %(text)r"
5715
msgstr ""
5716
5717
#: bzrlib/errors.py:2339
5718
msgid "Bad bzr revision-bundle: %(text)r"
5719
msgstr ""
5720
5721
#: bzrlib/errors.py:2348
5722
msgid "Malformed bzr revision-bundle header: %(text)r"
5723
msgstr ""
5724
5725
#: bzrlib/errors.py:2353
5726
msgid "Malformed patches in bzr revision-bundle: %(text)r"
5727
msgstr ""
5728
5729
#: bzrlib/errors.py:2358
5730
msgid "Malformed footer in bzr revision-bundle: %(text)r"
5731
msgstr ""
5732
5733
#: bzrlib/errors.py:2363
5734
msgid "End of line marker was not \\n in bzr revision-bundle"
5735
msgstr ""
5736
5737
#: bzrlib/errors.py:2373
5738
msgid "Bundle format %(bundle_format)s is incompatible with %(other)s"
5739
msgstr ""
5740
5741
#: bzrlib/errors.py:2383
5742
msgid "Root class for inventory serialization errors"
5743
msgstr ""
5744
5745
#: bzrlib/errors.py:2387
5746
msgid ""
5747
"The inventory was not in the expected format:\n"
5748
" %(msg)s"
5749
msgstr ""
5750
5751
#: bzrlib/errors.py:2396
5752
msgid "This operation requires rich root data storage"
5753
msgstr ""
5754
5755
#: bzrlib/errors.py:2409
5756
msgid "Unrecognised value for BZR_SSH environment variable: %(vendor)s"
5757
msgstr ""
5758
5759
#: bzrlib/errors.py:2418
5760
msgid ""
5761
"Don't know how to handle SSH connections. Please set BZR_SSH environment "
5762
"variable."
5763
msgstr ""
5764
5765
#: bzrlib/errors.py:2425
5766
msgid ""
5767
"Could not determine revno for {%(revision_id)s} because its ancestry shows a "
5768
"ghost at {%(ghost_revision_id)s}"
5769
msgstr ""
5770
5771
#: bzrlib/errors.py:2435
5772
msgid "Ghost revision {%(revision_id)s} cannot be used here."
5773
msgstr ""
5774
5775
#: bzrlib/errors.py:2486
5776
msgid ""
5777
"A merge directive must provide either a bundle or a public branch location."
5778
msgstr ""
5779
5780
#: bzrlib/errors.py:2493
5781
msgid "Bad merge directive payload %(start)r"
5782
msgstr ""
5783
5784
#: bzrlib/errors.py:2503
5785
msgid "Preview patch does not match requested changes."
5786
msgstr ""
5787
5788
#: bzrlib/errors.py:2509
5789
msgid "Patch_type was %(patch_type)s, but no patch was supplied."
5790
msgstr ""
5791
5792
#: bzrlib/errors.py:2519
5793
msgid ""
5794
"Your branch does not have all of the revisions required in order to merge "
5795
"this merge directive and the target location specified in the merge "
5796
"directive is not a branch: %(location)s."
5797
msgstr ""
5798
5799
#: bzrlib/errors.py:2531
5800
msgid "Unsupported entry kind %(kind)s"
5801
msgstr ""
5802
5803
#: bzrlib/errors.py:2539
5804
msgid "Can't subsume %(other_tree)s into %(tree)s. %(reason)s"
5805
msgstr ""
5806
5807
#: bzrlib/errors.py:2549
5808
msgid "Subsume target %(other_tree)s needs to be upgraded."
5809
msgstr ""
5810
5811
#: bzrlib/errors.py:2568
5812
msgid "No such tag: %(tag_name)s"
5813
msgstr ""
5814
5815
#: bzrlib/errors.py:2576
5816
msgid "Tags not supported by %(branch)s; you may be able to use bzr upgrade."
5817
msgstr ""
5818
5819
#: bzrlib/errors.py:2585
5820
msgid "Tag %(tag_name)s already exists."
5821
msgstr ""
5822
5823
#: bzrlib/errors.py:2593
5824
msgid ""
5825
"Did not understand bug identifier %(bug_id)s: %(reason)s. See \"bzr help "
5826
"bugs\" for more information on this feature."
5827
msgstr ""
5828
5829
#: bzrlib/errors.py:2603
5830
msgid ""
5831
"The URL for bug tracker \"%(abbreviation)s\" doesn't contain {id}: %(url)s"
5832
msgstr ""
5833
5834
#: bzrlib/errors.py:2613
5835
msgid ""
5836
"Cannot find registered bug tracker called %(abbreviation)s on %(branch)s"
5837
msgstr ""
5838
5839
#: bzrlib/errors.py:2623
5840
msgid "Invalid line in bugs property: '%(line)s'"
5841
msgstr ""
5842
5843
#: bzrlib/errors.py:2631
5844
msgid "Invalid bug status: '%(status)s'"
5845
msgstr ""
5846
5847
#: bzrlib/errors.py:2639
5848
msgid "Could not understand response from smart server: %(response_tuple)r"
5849
msgstr ""
5850
5851
#: bzrlib/errors.py:2678
5852
msgid "Server sent an unexpected error: %(error_tuple)r"
5853
msgstr ""
5854
5855
#: bzrlib/errors.py:2697
5856
msgid "Unrecognised container format: %(container_format)r"
5857
msgstr ""
5858
5859
#: bzrlib/errors.py:2705
5860
msgid "Unexpected end of container stream"
5861
msgstr ""
5862
5863
#: bzrlib/errors.py:2710
5864
msgid "Unknown record type: %(record_type)r"
5865
msgstr ""
5866
5867
#: bzrlib/errors.py:2718
5868
msgid "Invalid record: %(reason)s"
5869
msgstr ""
5870
5871
#: bzrlib/errors.py:2726
5872
msgid "Container has data after end marker: %(excess)r"
5873
msgstr ""
5874
5875
#: bzrlib/errors.py:2734
5876
msgid "Container has multiple records with the same name: %(name)s"
5877
msgstr ""
5878
5879
#: bzrlib/errors.py:2747
5880
msgid "Corrupt or incompatible data stream: %(reason)s"
5881
msgstr ""
5882
5883
#: bzrlib/errors.py:2755
5884
msgid "SMTP error: %(error)s"
5885
msgstr ""
5886
5887
#: bzrlib/errors.py:2763
5888
msgid "No message supplied."
5889
msgstr ""
5890
5891
#: bzrlib/errors.py:2768
5892
msgid "No mail-to address (--mail-to) or output (-o) specified."
5893
msgstr ""
5894
5895
#: bzrlib/errors.py:2773
5896
msgid "Unknown mail client: %(mail_client)s"
5897
msgstr ""
5898
5899
#: bzrlib/errors.py:2781
5900
msgid ""
5901
"Unable to find mail client with the following names: "
5902
"%(mail_command_list_string)s"
5903
msgstr ""
5904
5905
#: bzrlib/errors.py:2791
5906
msgid "SMTP connection to %(host)s refused"
5907
msgstr ""
5908
5909
#: bzrlib/errors.py:2800
5910
msgid "Please specify smtp_server. No server at default %(host)s."
5911
msgstr ""
5912
5913
#: bzrlib/errors.py:2814
5914
msgid ""
5915
"'%(display_url)s' is not in sync with %(target_url)s. See bzr help sync-for-"
5916
"reconfigure."
5917
msgstr ""
5918
5919
#: bzrlib/errors.py:2826
5920
msgid "'%(display_url)s' is already a branch."
5921
msgstr ""
5922
5923
#: bzrlib/errors.py:2831
5924
msgid "'%(display_url)s' is already a tree."
5925
msgstr ""
5926
5927
#: bzrlib/errors.py:2836
5928
msgid "'%(display_url)s' is already a checkout."
5929
msgstr ""
5930
5931
#: bzrlib/errors.py:2841
5932
msgid "'%(display_url)s' is already a lightweight checkout."
5933
msgstr ""
5934
5935
#: bzrlib/errors.py:2846
5936
msgid "'%(display_url)s' is already using a shared repository."
5937
msgstr ""
5938
5939
#: bzrlib/errors.py:2851
5940
msgid "'%(display_url)s' is already standalone."
5941
msgstr ""
5942
5943
#: bzrlib/errors.py:2856
5944
msgid "Shared repository '%(display_url)s' already creates working trees."
5945
msgstr ""
5946
5947
#: bzrlib/errors.py:2862
5948
msgid ""
5949
"Shared repository '%(display_url)s' already doesn't create working trees."
5950
msgstr ""
5951
5952
#: bzrlib/errors.py:2868
5953
msgid "Requested reconfiguration of '%(display_url)s' is not supported."
5954
msgstr ""
5955
5956
#: bzrlib/errors.py:2873
5957
msgid "No location could be found to bind to at %(display_url)s."
5958
msgstr ""
5959
5960
#: bzrlib/errors.py:2878
5961
msgid ""
5962
"Working tree \"%(display_url)s\" has uncommitted changes (See bzr "
5963
"status).%(more)s"
5964
msgstr ""
5965
5966
#: bzrlib/errors.py:2897
5967
msgid ""
5968
"Working tree \"%(display_url)s\" has shelved changes (See bzr shelve --"
5969
"list).%(more)s"
5970
msgstr ""
5971
5972
#: bzrlib/errors.py:2903
5973
msgid "Variable {%(name)s} is not available."
5974
msgstr ""
5975
5976
#: bzrlib/errors.py:2911
5977
msgid "No template specified."
5978
msgstr ""
5979
5980
#: bzrlib/errors.py:2916
5981
msgid "Unable to create symlink %(path_str)son this platform"
5982
msgstr ""
5983
5984
#: bzrlib/errors.py:2931
5985
msgid ""
5986
"Unsupported timezone format \"%(timezone)s\", options are \"utc\", "
5987
"\"original\", \"local\"."
5988
msgstr ""
5989
5990
#: bzrlib/errors.py:2965
5991
msgid ""
5992
"Unable to encode %(kind)s path %(path)r in user encoding %(user_encoding)s"
5993
msgstr ""
5994
5995
#: bzrlib/errors.py:2977
5996
msgid "The \"%(config_id)s\" configuration does not exist."
5997
msgstr ""
5998
5999
#: bzrlib/errors.py:2985
6000
msgid "The \"%(option_name)s\" configuration option does not exist."
6001
msgstr ""
6002
6003
#: bzrlib/errors.py:2993
6004
msgid "The alias \"%(alias_name)s\" does not exist."
6005
msgstr ""
6006
6007
#: bzrlib/errors.py:3007
6008
msgid "\"%(alias_name)s\" is not a valid location alias."
6009
msgstr ""
6010
6011
#: bzrlib/errors.py:3015
6012
msgid "No %(alias_name)s location assigned."
6013
msgstr ""
6014
6015
#: bzrlib/errors.py:3023
6016
msgid "Cannot bind address \"%(host)s:%(port)i\": %(orig_error)s."
6017
msgstr ""
6018
6019
#: bzrlib/errors.py:3033
6020
msgid "Unknown rules detected: %(unknowns_str)s."
6021
msgstr ""
6022
6023
#: bzrlib/errors.py:3044
6024
msgid "Tip change rejected: %(msg)s"
6025
msgstr ""
6026
6027
#: bzrlib/errors.py:3052
6028
msgid "Shelf corrupt."
6029
msgstr ""
6030
6031
#: bzrlib/errors.py:3057
6032
msgid "Corruption while decompressing repository file%(orig_error)s"
6033
msgstr ""
6034
6035
#: bzrlib/errors.py:3069
6036
msgid "No changes are shelved with id \"%(shelf_id)d\"."
6037
msgstr ""
6038
6039
#: bzrlib/errors.py:3077
6040
msgid "\"%(invalid_id)s\" is not a valid shelf id, try a number instead."
6041
msgstr ""
6042
6043
#: bzrlib/errors.py:3085
6044
msgid ""
6045
"An attempt to access a url outside the server jail was made: '%(url)s'."
6046
msgstr ""
6047
6048
#: bzrlib/errors.py:3093
6049
msgid "The user aborted the operation."
6050
msgstr ""
6051
6052
#: bzrlib/errors.py:3098
6053
msgid "Branching '%(url)s'(%(format)s) must create a working tree."
6054
msgstr ""
6055
6056
#: bzrlib/errors.py:3108
6057
msgid "No such view: %(view_name)s."
6058
msgstr ""
6059
6060
#: bzrlib/errors.py:3118
6061
msgid ""
6062
"Views are not supported by %(tree)s; use 'bzr upgrade' to change your tree "
6063
"to a later format."
6064
msgstr ""
6065
6066
#: bzrlib/errors.py:3127
6067
msgid ""
6068
"Specified file \"%(file_name)s\" is outside the current view: %(view_str)s"
6069
msgstr ""
6070
6071
#: bzrlib/errors.py:3194
6072
msgid "%(bzrdir)r does not support co-located branches."
6073
msgstr ""
6074
6075
#: bzrlib/errors.py:3200
6076
msgid ""
6077
"Unable to determine your name.\n"
6078
"Please, set your name with the 'whoami' command.\n"
6079
"E.g. bzr whoami \"Your Name <name@example.com>\""
6080
msgstr ""
6081
6082
#: bzrlib/errors.py:3209
6083
msgid "Invalid pattern(s) found. %(msg)s"
6084
msgstr ""
6085
6086
#: bzrlib/errors.py:3217
6087
msgid ""
6088
"Branch \"%(branch_url)s\" appears to be bound to itself. Please use `bzr "
6089
"unbind` to fix."
6090
msgstr ""
6091
6092
#: bzrlib/errors.py:3228
6093
msgid "Loop involving %(refs)r while expanding \"%(string)s\"."
6094
msgstr ""
6095
6096
#: bzrlib/errors.py:3237
6097
msgid "Option %(name)s is not defined while expanding \"%(string)s\"."
6098
msgstr ""
6099
6100
#: bzrlib/errors.py:3246
6101
msgid ""
6102
"No compatible object available for operations from %(source)r to %(target)r."
6103
msgstr ""
6104
6105
#: bzrlib/errors.py:3256
6106
msgid ""
6107
"VFS requests over the smart server are not allowed. Encountered: %(method)s, "
6108
"%(arguments)s."
6109
msgstr ""
6110
6111
#: bzrlib/errors.py:3266
6112
msgid ""
6113
"Kind change from %(from_kind)s to %(to_kind)s for %(path)s not supported by "
6114
"format %(format)r"
6115
msgstr ""
6116
6117
#: bzrlib/errors.py:3278
6118
msgid ""
6119
"Missing feature %(feature)s not provided by this version of Bazaar or any "
6120
"plugin."
6121
msgstr ""
6122
6123
#: bzrlib/errors.py:3291
6124
msgid "Binary files section encountered."
6125
msgstr ""
6126
6127
#: bzrlib/errors.py:3299
6128
msgid ""
6129
"Malformed patch header. %(desc)s\n"
6130
"%(line)r"
6131
msgstr ""
6132
6133
#: bzrlib/errors.py:3308
6134
msgid ""
6135
"Malformed hunk header. %(desc)s\n"
6136
"%(line)r"
6137
msgstr ""
6138
6139
#: bzrlib/errors.py:3317
6140
msgid ""
6141
"Malformed line. %(desc)s\n"
6142
"%(line)r"
6143
msgstr ""
6144
6145
#: bzrlib/errors.py:3327
6146
msgid ""
6147
"Text contents mismatch at line %(line_no)d. Original has \"%(orig_line)s\", "
6148
"but patch says it should be \"%(patch_line)s\""
6149
msgstr ""
6150
6151
#: bzrlib/errors.py:3338
6152
msgid "The feature %(feature)s has already been registered."
6153
msgstr ""
6154
6155
#: bzrlib/export_pot.py:252
6156
#, python-format
6157
msgid "Exporting messages from builtin command: %s"
6158
msgstr ""
6159
6160
#: bzrlib/export_pot.py:271
6161
msgid "Exporting messages from plugin command: {0} in {1}"
6162
msgstr ""
6163
6164
#: bzrlib/export_pot.py:292
6165
#, python-format
6166
msgid "Exporting message from error: %s"
6167
msgstr ""
6168
6169
#: bzrlib/fetch.py:98
6170
msgid "Finding revisions"
6171
msgstr ""
6172
6173
#: bzrlib/fetch.py:103
6174
msgid "Fetching revisions"
6175
msgstr ""
6176
6177
#: bzrlib/foreign.py:262
6178
msgid "Push into a different VCS without any custom bzr metadata."
6179
msgstr ""
6180
6181
#: bzrlib/foreign.py:264
6182
msgid ""
6183
"This will afterwards rebase the local branch on the remote\n"
6184
"branch unless the --no-rebase option is used, in which case \n"
6185
"the two branches will be out of sync after the push. "
6186
msgstr ""
6187
6188
#: bzrlib/foreign.py:277
6189
msgid "Do not rebase after push."
6190
msgstr ""
6191
6192
#: bzrlib/foreign.py:311
6193
#, python-format
6194
msgid "Using saved location: %s\n"
6195
msgstr ""
6196
6197
#: bzrlib/foreign.py:321
6198
msgid ""
6199
"{0!r} and {1!r} are in the same VCS, lossy push not necessary. Please use "
6200
"regular push."
6201
msgstr ""
6202
6203
#: bzrlib/gpg.py:119 bzrlib/gpg.py:460
6204
msgid "{0} commits with valid signatures"
6205
msgstr ""
6206
6207
#: bzrlib/gpg.py:123 bzrlib/gpg.py:465
6208
msgid "{0} commit with unknown key"
6209
msgid_plural "{0} commits with unknown keys"
6210
msgstr[0] ""
6211
msgstr[1] ""
6212
6213
#: bzrlib/gpg.py:129 bzrlib/gpg.py:472
6214
msgid "{0} commit not valid"
6215
msgid_plural "{0} commits not valid"
6216
msgstr[0] ""
6217
msgstr[1] ""
6218
6219
#: bzrlib/gpg.py:135 bzrlib/gpg.py:479
6220
msgid "{0} commit not signed"
6221
msgid_plural "{0} commits not signed"
6222
msgstr[0] ""
6223
msgstr[1] ""
6224
6225
#: bzrlib/gpg.py:141 bzrlib/gpg.py:486
6226
msgid "{0} commit with key now expired"
6227
msgid_plural "{0} commits with key now expired"
6228
msgstr[0] ""
6229
msgstr[1] ""
6230
6231
#: bzrlib/gpg.py:343
6232
msgid "No GnuPG key results for pattern: {0}"
6233
msgstr ""
6234
6235
#: bzrlib/gpg.py:386
6236
msgid "{0} signed {1} commit"
6237
msgid_plural "{0} signed {1} commits"
6238
msgstr[0] ""
6239
msgstr[1] ""
6240
6241
#: bzrlib/gpg.py:403 bzrlib/gpg.py:419
6242
msgid "{0} commit by author {1}"
6243
msgid_plural "{0} commits by author {1}"
6244
msgstr[0] ""
6245
msgstr[1] ""
6246
6247
#: bzrlib/gpg.py:433
6248
msgid "Unknown key {0} signed {1} commit"
6249
msgid_plural "Unknown key {0} signed {1} commits"
6250
msgstr[0] ""
6251
msgstr[1] ""
6252
6253
#: bzrlib/gpg.py:452
6254
msgid "{0} commit by author {1} with key {2} now expired"
6255
msgid_plural "{0} commits by author {1} with key {2} now expired"
6256
msgstr[0] ""
6257
msgstr[1] ""
6258
6259
#: bzrlib/groupcompress.py:1739
6260
#, python-format
6261
msgid "Insert claimed random_id=True, but then inserted %r two times"
6262
msgstr ""
6263
6264
#: bzrlib/hooks.py:331
6265
#, python-format
6266
msgid "Introduced in: %s"
6267
msgstr ""
6268
6269
#: bzrlib/hooks.py:334
6270
#, python-format
6271
msgid "Deprecated in: %s"
6272
msgstr ""
6273
6274
#: bzrlib/knit.py:1766 bzrlib/knit.py:1802
6275
msgid "Walking content"
6276
msgstr ""
6277
6278
#: bzrlib/knit.py:3330
6279
msgid "annotating"
6280
msgstr ""
6281
6282
#: bzrlib/lock.py:548
6283
msgid "{0!r} was {1} locked again"
6284
msgstr ""
6285
6286
#: bzrlib/lockdir.py:321
6287
#, python-format
6288
msgid "error removing pending lock: %s"
6289
msgstr ""
6290
6291
#: bzrlib/lockdir.py:616
6292
msgid "Unable to obtain"
6293
msgstr ""
6294
6295
#: bzrlib/lockdir.py:618
6296
msgid "Lock owner changed for"
6297
msgstr ""
6298
6299
#: bzrlib/lockdir.py:620
6300
msgid "{0} lock {1} {2}."
6301
msgstr ""
6302
6303
#: bzrlib/lockdir.py:627
6304
#, python-format
6305
msgid "Will continue to try until %s, unless you press Ctrl-C."
6306
msgstr ""
6307
6308
#: bzrlib/lockdir.py:629
6309
msgid "See \"bzr help break-lock\" for more."
6310
msgstr ""
6311
6312
#: bzrlib/lockdir.py:739
6313
#, python-format
6314
msgid ""
6315
"held by %(user)s on %(hostname)s (process #%(pid)s), acquired %(time_ago)s"
6316
msgstr ""
6317
6318
#: bzrlib/log.py:572
6319
msgid "--exclude-common-ancestry requires two different revisions"
6320
msgstr ""
6321
6322
#: bzrlib/log.py:574
6323
#, python-format
6324
msgid "invalid direction %r"
6325
msgstr ""
6326
6327
#: bzrlib/log.py:662
6328
msgid "Start revision not found in history of end revision."
6329
msgstr ""
6330
6331
#: bzrlib/log.py:1080 bzrlib/log.py:1138
6332
msgid "Logging revision 0 is invalid."
6333
msgstr ""
6334
6335
#: bzrlib/log.py:1082 bzrlib/log.py:1140
6336
msgid "Start revision must be older than the end revision."
6337
msgstr ""
6338
6339
#: bzrlib/log.py:1827
6340
#, python-format
6341
msgid "unknown log formatter: %r"
6342
msgstr ""
6343
6344
#: bzrlib/log.py:2123
6345
msgid "fixes bug"
6346
msgid_plural "fixes bugs"
6347
msgstr[0] ""
6348
msgstr[1] ""
6349
6350
#: bzrlib/merge.py:689
6351
msgid "All changes applied successfully."
6352
msgstr ""
6353
6354
#: bzrlib/merge.py:691
6355
#, python-format
6356
msgid "%d conflicts encountered."
6357
msgstr ""
6358
6359
#: bzrlib/merge.py:845 bzrlib/merge.py:1933
6360
msgid "Preparing file merge"
6361
msgstr ""
6362
6363
#: bzrlib/multiparent.py:426
6364
msgid "Importing revisions"
6365
msgstr ""
6366
6367
#: bzrlib/option.py:526
6368
msgid "Show help message."
6369
msgstr ""
6370
6371
#: bzrlib/option.py:528
6372
msgid "Only display errors and warnings."
6373
msgstr ""
6374
6375
#: bzrlib/option.py:531
6376
msgid "Show usage message and options."
6377
msgstr ""
6378
6379
#: bzrlib/option.py:533
6380
msgid "Display more information."
6381
msgstr ""
6382
6383
#: bzrlib/option.py:541
6384
msgid ""
6385
"Select changes introduced by the specified revision. See also \"help "
6386
"revisionspec\"."
6387
msgstr ""
6388
6389
#: bzrlib/option.py:543
6390
msgid "Branch to operate on, instead of working directory."
6391
msgstr ""
6392
6393
#: bzrlib/option.py:545
6394
msgid "Detailed log format."
6395
msgstr ""
6396
6397
#: bzrlib/option.py:545
6398
msgid "Format used by GNU ChangeLog files."
6399
msgstr ""
6400
6401
#: bzrlib/option.py:545
6402
msgid "Log format with one line per revision."
6403
msgstr ""
6404
6405
#: bzrlib/option.py:545
6406
msgid "Moderately short log format."
6407
msgstr ""
6408
6409
#: bzrlib/option.py:545
6410
msgid "Use specified log format."
6411
msgstr ""
6412
6413
#: bzrlib/option.py:547
6414
msgid "Log format"
6415
msgstr ""
6416
6417
#: bzrlib/option.py:549
6418
msgid "LCA-newness merge."
6419
msgstr ""
6420
6421
#: bzrlib/option.py:549
6422
msgid "Merge using external diff3."
6423
msgstr ""
6424
6425
#: bzrlib/option.py:549
6426
msgid "Native diff3-style merge."
6427
msgstr ""
6428
6429
#: bzrlib/option.py:549
6430
msgid "Select a particular merge algorithm."
6431
msgstr ""
6432
6433
#: bzrlib/option.py:549
6434
msgid "Weave-based merge."
6435
msgstr ""
6436
6437
#: bzrlib/option.py:551
6438
msgid "Merge algorithm"
6439
msgstr ""
6440
6441
#: bzrlib/option.py:554
6442
msgid "Message string."
6443
msgstr ""
6444
6445
#: bzrlib/option.py:556
6446
msgid "Use an ASCII NUL (\\0) separator rather than a newline."
6447
msgstr ""
6448
6449
#: bzrlib/option.py:558
6450
msgid "Ignore differences between branches and overwrite unconditionally."
6451
msgstr ""
6452
6453
#: bzrlib/option.py:560
6454
msgid "Remember the specified location as a default."
6455
msgstr ""
6456
6457
#: bzrlib/option.py:562
6458
msgid "Reprocess to reduce spurious conflicts."
6459
msgstr ""
6460
6461
#: bzrlib/option.py:566
6462
msgid "See \"help revisionspec\" for details."
6463
msgstr ""
6464
6465
#: bzrlib/option.py:568
6466
msgid "Show internal object ids."
6467
msgstr ""
6468
6469
#: bzrlib/option.py:571
6470
msgid "Display timezone as local, original, or utc."
6471
msgstr ""
6472
6473
#: bzrlib/osutils.py:100
6474
msgid "Parameter {0!r} encoding is unsupported by {1} application locale."
6475
msgstr ""
6476
6477
#: bzrlib/osutils.py:220
6478
msgid "lstat/stat of ({0!r}): {1!r}"
6479
msgstr ""
6480
6481
#: bzrlib/osutils.py:1008 bzrlib/osutils.py:1019
6482
#, python-format
6483
msgid "sorry, %r not allowed in path"
6484
msgstr ""
6485
6486
#: bzrlib/osutils.py:1237
6487
#, python-format
6488
msgid "%r is too short to calculate a relative path"
6489
msgstr ""
6490
6491
#: bzrlib/plugin.py:143
6492
#, python-format
6493
msgid "\"%s\" is not a valid <plugin_name>@<plugin_path> description "
6494
msgstr ""
6495
6496
#: bzrlib/plugins/bash_completion/bashcomp.py:411
6497
msgid "Enable completions for the selected plugin (default: all plugins)"
6498
msgstr ""
6499
6500
#: bzrlib/plugins/bash_completion/bashcomp.py:412
6501
msgid "Generate a shell function for bash command line completion."
6502
msgstr ""
6503
6504
#: bzrlib/plugins/bash_completion/bashcomp.py:414
6505
msgid ""
6506
"This command generates a shell function which can be used by bash to\n"
6507
"automatically complete the currently typed command when the user presses\n"
6508
"the completion key (usually tab)."
6509
msgstr ""
6510
6511
#: bzrlib/plugins/bash_completion/bashcomp.py:418
6512
msgid ""
6513
"Commonly used like this:\n"
6514
" eval \"`bzr bash-completion`\""
6515
msgstr ""
6516
6517
#: bzrlib/plugins/bash_completion/bashcomp.py:424
6518
msgid "Name of the generated function (default: _bzr)"
6519
msgstr ""
6520
6521
#: bzrlib/plugins/bash_completion/bashcomp.py:426
6522
msgid "Generate only the shell function, don't enable it"
6523
msgstr ""
6524
6525
#: bzrlib/plugins/launchpad/__init__.py:81
6526
msgid "Register a branch with launchpad.net."
6527
msgstr ""
6528
6529
#: bzrlib/plugins/launchpad/__init__.py:83
6530
msgid ""
6531
"This command lists a bzr branch in the directory of branches on\n"
6532
"launchpad.net. Registration allows the branch to be associated with\n"
6533
"bugs or specifications."
6534
msgstr ""
6535
6536
#: bzrlib/plugins/launchpad/__init__.py:87
6537
msgid ""
6538
"Before using this command you must register the project to which the\n"
6539
"branch belongs, and create an account for yourself on launchpad.net."
6540
msgstr ""
6541
6542
#: bzrlib/plugins/launchpad/__init__.py:90
6543
msgid ""
6544
"arguments:\n"
6545
" public_url: The publicly visible url for the branch to register.\n"
6546
" This must be an http or https url (which Launchpad can read\n"
6547
" from to access the branch). Local file urls, SFTP urls, and\n"
6548
" bzr+ssh urls will not work.\n"
6549
" If no public_url is provided, bzr will use the configured\n"
6550
" public_url if there is one for the current branch, and\n"
6551
" otherwise error."
6552
msgstr ""
6553
6554
#: bzrlib/plugins/launchpad/__init__.py:99
6555
msgid ""
6556
"example:\n"
6557
" bzr register-branch http://foo.com/bzr/fooproject.mine \\\n"
6558
" --project fooproject"
6559
msgstr ""
6560
6561
#: bzrlib/plugins/launchpad/__init__.py:106
6562
msgid "Launchpad project short name to associate with the branch."
6563
msgstr ""
6564
6565
#: bzrlib/plugins/launchpad/__init__.py:113
6566
msgid ""
6567
"Short name for the branch; by default taken from the last component of the "
6568
"url."
6569
msgstr ""
6570
6571
#: bzrlib/plugins/launchpad/__init__.py:117
6572
msgid "One-sentence description of the branch."
6573
msgstr ""
6574
6575
#: bzrlib/plugins/launchpad/__init__.py:120
6576
msgid "Longer description of the purpose or contents of the branch."
6577
msgstr ""
6578
6579
#: bzrlib/plugins/launchpad/__init__.py:123
6580
msgid "Branch author's email address, if not yourself."
6581
msgstr ""
6582
6583
#: bzrlib/plugins/launchpad/__init__.py:126
6584
msgid "The bug this branch fixes."
6585
msgstr ""
6586
6587
#: bzrlib/plugins/launchpad/__init__.py:129
6588
msgid "Prepare the request but don't actually send it."
6589
msgstr ""
6590
6591
#: bzrlib/plugins/launchpad/__init__.py:151
6592
msgid ""
6593
"register-branch requires a public branch url - see bzr help register-branch."
6594
msgstr ""
6595
6596
#: bzrlib/plugins/launchpad/__init__.py:159
6597
msgid "--product is deprecated; please use --project."
6598
msgstr ""
6599
6600
#: bzrlib/plugins/launchpad/__init__.py:191
6601
msgid "Open a Launchpad branch page in your web browser."
6602
msgstr ""
6603
6604
#: bzrlib/plugins/launchpad/__init__.py:196
6605
msgid "Do not actually open the browser. Just say the URL we would use."
6606
msgstr ""
6607
6608
#: bzrlib/plugins/launchpad/__init__.py:231
6609
#, python-format
6610
msgid "Opening %s in web browser"
6611
msgstr ""
6612
6613
#: bzrlib/plugins/launchpad/__init__.py:241
6614
msgid "Show or set the Launchpad user ID."
6615
msgstr ""
6616
6617
#: bzrlib/plugins/launchpad/__init__.py:243
6618
msgid ""
6619
"When communicating with Launchpad, some commands need to know your\n"
6620
"Launchpad user ID. This command can be used to set or show the\n"
6621
"user ID that Bazaar will use for such communication."
6622
msgstr ""
6623
6624
#: bzrlib/plugins/launchpad/__init__.py:247
6625
msgid ""
6626
":Examples:\n"
6627
" Show the Launchpad ID of the current user::"
6628
msgstr ""
6629
6630
#: bzrlib/plugins/launchpad/__init__.py:250
6631
msgid " bzr launchpad-login"
6632
msgstr ""
6633
6634
#: bzrlib/plugins/launchpad/__init__.py:252
6635
msgid " Set the Launchpad ID of the current user to 'bob'::"
6636
msgstr ""
6637
6638
#: bzrlib/plugins/launchpad/__init__.py:254
6639
msgid " bzr launchpad-login bob"
6640
msgstr ""
6641
6642
#: bzrlib/plugins/launchpad/__init__.py:261
6643
msgid "Don't check that the user name is valid."
6644
msgstr ""
6645
6646
#: bzrlib/plugins/launchpad/__init__.py:276
6647
#: bzrlib/plugins/launchpad/__init__.py:287
6648
msgid "Launchpad user ID exists and has SSH keys.\n"
6649
msgstr ""
6650
6651
#: bzrlib/plugins/launchpad/__init__.py:279
6652
msgid "No Launchpad user ID configured.\n"
6653
msgstr ""
6654
6655
#: bzrlib/plugins/launchpad/__init__.py:290
6656
#, python-format
6657
msgid "Launchpad user ID set to '%s'.\n"
6658
msgstr ""
6659
6660
#: bzrlib/plugins/launchpad/__init__.py:298
6661
msgid "Ask Launchpad to mirror a branch now."
6662
msgstr ""
6663
6664
#: bzrlib/plugins/launchpad/__init__.py:318
6665
msgid "Propose merging a branch on Launchpad."
6666
msgstr ""
6667
6668
#: bzrlib/plugins/launchpad/__init__.py:320
6669
msgid ""
6670
"This will open your usual editor to provide the initial comment. When it\n"
6671
"has created the proposal, it will open it in your default web browser."
6672
msgstr ""
6673
6674
#: bzrlib/plugins/launchpad/__init__.py:323
6675
msgid ""
6676
"The branch will be proposed to merge into SUBMIT_BRANCH. If SUBMIT_BRANCH\n"
6677
"is not supplied, the remembered submit branch will be used. If no submit\n"
6678
"branch is remembered, the development focus will be used."
6679
msgstr ""
6680
6681
#: bzrlib/plugins/launchpad/__init__.py:327
6682
msgid ""
6683
"By default, the SUBMIT_BRANCH's review team will be requested to review\n"
6684
"the merge proposal. This can be overriden by specifying --review (-R).\n"
6685
"The parameter the launchpad account name of the desired reviewer. This\n"
6686
"may optionally be followed by '=' and the review type. For example:"
6687
msgstr ""
6688
6689
#: bzrlib/plugins/launchpad/__init__.py:332
6690
msgid " bzr lp-propose-merge --review jrandom --review review-team=qa"
6691
msgstr ""
6692
6693
#: bzrlib/plugins/launchpad/__init__.py:334
6694
msgid ""
6695
"This will propose a merge, request \"jrandom\" to perform a review of\n"
6696
"unspecified type, and request \"review-team\" to perform a \"qa\" review."
6697
msgstr ""
6698
6699
#: bzrlib/plugins/launchpad/__init__.py:339
6700
msgid "Propose the merge on staging."
6701
msgstr ""
6702
6703
#: bzrlib/plugins/launchpad/__init__.py:341
6704
msgid "Commit message."
6705
msgstr ""
6706
6707
#: bzrlib/plugins/launchpad/__init__.py:343
6708
msgid "Mark the proposal as approved immediately."
6709
msgstr ""
6710
6711
#: bzrlib/plugins/launchpad/__init__.py:345
6712
msgid "Requested reviewer and optional type."
6713
msgstr ""
6714
6715
#: bzrlib/plugins/launchpad/__init__.py:382
6716
msgid "Find the proposal to merge this revision."
6717
msgstr ""
6718
6719
#: bzrlib/plugins/launchpad/__init__.py:384
6720
msgid ""
6721
"Finds the merge proposal(s) that discussed landing the specified revision.\n"
6722
"This works only if the selected branch was the merge proposal target, and\n"
6723
"if the merged_revno is recorded for the merge proposal. The proposal(s)\n"
6724
"are opened in a web browser."
6725
msgstr ""
6726
6727
#: bzrlib/plugins/launchpad/__init__.py:389
6728
msgid ""
6729
"Any revision involved in the merge may be specified-- the revision in\n"
6730
"which the merge was performed, or one of the revisions that was merged."
6731
msgstr ""
6732
6733
#: bzrlib/plugins/launchpad/__init__.py:392
6734
msgid "So, to find the merge proposal that reviewed line 1 of README::"
6735
msgstr ""
6736
6737
#: bzrlib/plugins/launchpad/__init__.py:394
6738
msgid " bzr lp-find-proposal -r annotate:README:1"
6739
msgstr ""
6740
6741
#: bzrlib/plugins/launchpad/__init__.py:409
6742
msgid "No review found."
6743
msgstr ""
6744
6745
#: bzrlib/plugins/launchpad/__init__.py:410
6746
#, python-format
6747
msgid "%d proposals(s) found."
6748
msgstr ""
6749
6750
#: bzrlib/plugins/launchpad/__init__.py:420
6751
msgid "Finding revision-id"
6752
msgstr ""
6753
6754
#: bzrlib/plugins/launchpad/__init__.py:427
6755
msgid "Finding merge"
6756
msgstr ""
6757
6758
#: bzrlib/plugins/launchpad/__init__.py:432
6759
msgid "Finding revno"
6760
msgstr ""
6761
6762
#: bzrlib/plugins/launchpad/__init__.py:437
6763
msgid "Finding Launchpad branch"
6764
msgstr ""
6765
6766
#: bzrlib/plugins/launchpad/__init__.py:440
6767
msgid "Finding proposals"
6768
msgstr ""
6769
6770
#: bzrlib/plugins/launchpad/account.py:66
6771
msgid "Setting ssh/sftp usernames for launchpad.net."
6772
msgstr ""
6773
6774
#: bzrlib/plugins/launchpad/lp_api.py:241
6775
#: bzrlib/plugins/launchpad/lp_api.py:246
6776
#, python-format
6777
msgid "%s is not registered on Launchpad"
6778
msgstr ""
6779
6780
#: bzrlib/plugins/launchpad/lp_api.py:256
6781
#, python-format
6782
msgid "%s has no development focus."
6783
msgstr ""
6784
6785
#: bzrlib/plugins/launchpad/lp_api.py:261
6786
#, python-format
6787
msgid "development focus %s has no branch."
6788
msgstr ""
6789
6790
#: bzrlib/plugins/launchpad/lp_api.py:266
6791
#, python-format
6792
msgid "source package %s has no branch."
6793
msgstr ""
6794
6795
#: bzrlib/plugins/launchpad/lp_api.py:270
6796
#, python-format
6797
msgid "%s has no associated product or source package."
6798
msgstr ""
6799
6800
#: bzrlib/plugins/launchpad/lp_api.py:282
6801
#, python-format
6802
msgid "%s is already up-to-date."
6803
msgstr ""
6804
6805
#: bzrlib/plugins/launchpad/lp_api.py:289
6806
#, python-format
6807
msgid "Pushing to %s"
6808
msgstr ""
6809
6810
#: bzrlib/plugins/launchpad/lp_directory.py:170
6811
msgid ""
6812
"resolution for {0}\n"
6813
" local: {1}\n"
6814
" remote: {2}"
6815
msgstr ""
6816
6817
#: bzrlib/plugins/launchpad/lp_propose.py:149
6818
#, python-format
6819
msgid "There is already a branch merge proposal: %s"
6820
msgstr ""
6821
6822
#: bzrlib/plugins/weave_fmt/bzrdir.py:236
6823
msgid "pb parameter to convert() is deprecated"
6824
msgstr ""
6825
6826
#: bzrlib/plugins/weave_fmt/bzrdir.py:239
6827
msgid "starting upgrade from format 4 to 5"
6828
msgstr ""
6829
6830
#: bzrlib/plugins/weave_fmt/bzrdir.py:249
6831
msgid "note: upgrade may be faster if all store files are ungzipped first"
6832
msgstr ""
6833
6834
#: bzrlib/plugins/weave_fmt/bzrdir.py:278
6835
msgid "converting revision"
6836
msgstr ""
6837
6838
#: bzrlib/plugins/weave_fmt/bzrdir.py:283
6839
msgid "upgraded to weaves:"
6840
msgstr ""
6841
6842
#: bzrlib/plugins/weave_fmt/bzrdir.py:284
6843
#, python-format
6844
msgid "%6d revisions and inventories"
6845
msgstr ""
6846
6847
#: bzrlib/plugins/weave_fmt/bzrdir.py:286
6848
#, python-format
6849
msgid "%6d revisions not present"
6850
msgstr ""
6851
6852
#: bzrlib/plugins/weave_fmt/bzrdir.py:288
6853
#, python-format
6854
msgid "%6d texts"
6855
msgstr ""
6856
6857
#: bzrlib/plugins/weave_fmt/bzrdir.py:324
6858
msgid "writing weave"
6859
msgstr ""
6860
6861
#: bzrlib/plugins/weave_fmt/bzrdir.py:328
6862
#: bzrlib/plugins/weave_fmt/bzrdir.py:330
6863
msgid "inventory"
6864
msgstr ""
6865
6866
#: bzrlib/plugins/weave_fmt/bzrdir.py:347
6867
msgid "write revision"
6868
msgstr ""
6869
6870
#: bzrlib/plugins/weave_fmt/bzrdir.py:361
6871
msgid "loading revision"
6872
msgstr ""
6873
6874
#: bzrlib/plugins/weave_fmt/bzrdir.py:366
6875
#, python-format
6876
msgid "revision {%s} not present in branch; will be converted as a ghost"
6877
msgstr ""
6878
6879
#: bzrlib/plugins/weave_fmt/bzrdir.py:506
6880
msgid "starting upgrade from format 5 to 6"
6881
msgstr ""
6882
6883
#: bzrlib/plugins/weave_fmt/bzrdir.py:516
6884
#, python-format
6885
msgid "adding prefixes to %s"
6886
msgstr ""
6887
6888
#: bzrlib/plugins/weave_fmt/bzrdir.py:556
6889
msgid "starting upgrade from format 6 to metadir"
6890
msgstr ""
6891
6892
#: bzrlib/plugins/weave_fmt/bzrdir.py:564
6893
msgid "Removing ancestry.weave"
6894
msgstr ""
6895
6896
#: bzrlib/plugins/weave_fmt/bzrdir.py:569
6897
msgid "Finding branch files"
6898
msgstr ""
6899
6900
#: bzrlib/plugins/weave_fmt/bzrdir.py:579
6901
msgid "Upgrading repository"
6902
msgstr ""
6903
6904
#: bzrlib/plugins/weave_fmt/bzrdir.py:589
6905
msgid "Upgrading branch"
6906
msgstr ""
6907
6908
#: bzrlib/plugins/weave_fmt/bzrdir.py:612
6909
msgid "No working tree."
6910
msgstr ""
6911
6912
#: bzrlib/plugins/weave_fmt/bzrdir.py:619
6913
msgid "Upgrading working tree"
6914
msgstr ""
6915
6916
#: bzrlib/plugins/weave_fmt/bzrdir.py:640
6917
#, python-format
6918
msgid "Make %s lock"
6919
msgstr ""
6920
6921
#: bzrlib/plugins/weave_fmt/bzrdir.py:651
6922
#, python-format
6923
msgid "Moving %s"
6924
msgstr ""
6925
6926
#: bzrlib/push.py:56
6927
msgid "Created new branch."
6928
msgstr ""
6929
6930
#: bzrlib/push.py:97
6931
#, python-format
6932
msgid ""
6933
"Target directory %s already contains a .bzr directory, but it is not valid."
6934
msgstr ""
6935
6936
#: bzrlib/push.py:101
6937
#, python-format
6938
msgid ""
6939
"Target directory %s already exists, but does not have a .bzr directory. "
6940
"Supply --use-existing-dir to push there anyway."
6941
msgstr ""
6942
6943
#: bzrlib/push.py:122
6944
#, python-format
6945
msgid "Too many redirections trying to make %s."
6946
msgstr ""
6947
6948
#: bzrlib/push.py:147
6949
msgid ""
6950
"These branches have diverged. See \"bzr help diverged-branches\" for more "
6951
"information."
6952
msgstr ""
6953
6954
#: bzrlib/push.py:151
6955
#, python-format
6956
msgid ""
6957
"It is not possible to losslessly push to %s. You may want to use dpush "
6958
"instead."
6959
msgstr ""
6960
6961
#: bzrlib/push.py:157
6962
#, python-format
6963
msgid ""
6964
"At %s you have a valid .bzr control directory, but not a branch or "
6965
"repository. This is an unsupported configuration. Please move the target "
6966
"directory out of the way and try again."
6967
msgstr ""
6968
6969
#: bzrlib/reconcile.py:97
6970
#, python-format
6971
msgid "Reconciling branch %s"
6972
msgstr ""
6973
6974
#: bzrlib/reconcile.py:103
6975
#, python-format
6976
msgid "Reconciling repository %s"
6977
msgstr ""
6978
6979
#: bzrlib/reconcile.py:105
6980
msgid "Reconciling repository"
6981
msgstr ""
6982
6983
#: bzrlib/reconcile.py:111
6984
#, python-format
6985
msgid "%s cannot canonicalize CHKs."
6986
msgstr ""
6987
6988
#: bzrlib/reconcile.py:119
6989
msgid "Reconcile aborted: revision index has inconsistent parents."
6990
msgstr ""
6991
6992
#: bzrlib/reconcile.py:121
6993
msgid "Run \"bzr check\" for more details."
6994
msgstr ""
6995
6996
#: bzrlib/reconcile.py:123
6997
msgid "Reconciliation complete."
6998
msgstr ""
6999
7000
#: bzrlib/reconcile.py:166
7001
msgid "Fixing last revision info {0} => {1}"
7002
msgstr ""
7003
7004
#: bzrlib/reconcile.py:173
7005
msgid "revision_history ok."
7006
msgstr ""
7007
7008
#: bzrlib/reconcile.py:234
7009
msgid "Reading inventory data"
7010
msgstr ""
7011
7012
#: bzrlib/reconcile.py:254 bzrlib/reconcile.py:384
7013
msgid "Inventory ok."
7014
msgstr ""
7015
7016
#: bzrlib/reconcile.py:256 bzrlib/reconcile.py:386
7017
msgid "Backing up inventory"
7018
msgstr ""
7019
7020
#: bzrlib/reconcile.py:258
7021
msgid "Backup inventory created."
7022
msgstr ""
7023
7024
#: bzrlib/reconcile.py:274 bzrlib/reconcile.py:405
7025
msgid "Writing weave"
7026
msgstr ""
7027
7028
#: bzrlib/reconcile.py:277 bzrlib/reconcile.py:408
7029
msgid "Inventory regenerated."
7030
msgstr ""
7031
7032
#: bzrlib/reconcile.py:371 bzrlib/reconcile.py:373 bzrlib/reconcile.py:376
7033
msgid "Reading indexes"
7034
msgstr ""
7035
7036
#: bzrlib/reconcile.py:380 bzrlib/reconcile.py:382
7037
msgid "Checking unused inventories"
7038
msgstr ""
7039
7040
#: bzrlib/reconcile.py:388
7041
msgid "Backup Inventory created"
7042
msgstr ""
7043
7044
#: bzrlib/reconcile.py:446
7045
msgid "Fixing text parents"
7046
msgstr ""
7047
7048
#: bzrlib/reconfigure.py:54
7049
msgid "{0} is now stacked on {1}\n"
7050
msgstr ""
7051
7052
#: bzrlib/reconfigure.py:69
7053
#, python-format
7054
msgid "%s is now not stacked\n"
7055
msgstr ""
7056
7057
#: bzrlib/remote.py:1228 bzrlib/repository.py:289
7058
#, python-format
7059
msgid "bzr: ERROR (ignored): %s"
7060
msgstr ""
7061
7062
#: bzrlib/remote.py:2541
7063
msgid "Copying repository content as tarball..."
7064
msgstr ""
7065
7066
#: bzrlib/rename_map.py:69
7067
msgid "Calculating hashes"
7068
msgstr ""
7069
7070
#: bzrlib/rename_map.py:107
7071
msgid "Determining hash hits"
7072
msgstr ""
7073
7074
#: bzrlib/rename_map.py:242
7075
msgid "{0} => {1}"
7076
msgstr ""
7077
7078
#: bzrlib/repository.py:1787
7079
msgid "Moving repository to repository.backup"
7080
msgstr ""
7081
7082
#: bzrlib/repository.py:1794
7083
msgid "Creating new repository"
7084
msgstr ""
7085
7086
#: bzrlib/repository.py:1799
7087
msgid "Copying content"
7088
msgstr ""
7089
7090
#: bzrlib/repository.py:1803
7091
msgid "Deleting old repository content"
7092
msgstr ""
7093
7094
#: bzrlib/repository.py:1805
7095
msgid "repository converted"
7096
msgstr ""
7097
7098
#: bzrlib/revisionspec.py:903
7099
msgid "Using {0} {1}"
7100
msgstr ""
7101
7102
#: bzrlib/send.py:58
7103
#, python-format
7104
msgid "Mail client \"%s\" does not support specifying body"
7105
msgstr ""
7106
7107
#: bzrlib/send.py:62
7108
msgid "--remember requires a branch to be specified."
7109
msgstr ""
7110
7111
#: bzrlib/send.py:77
7112
msgid "No submit branch known or specified"
7113
msgstr ""
7114
7115
#: bzrlib/send.py:80
7116
msgid "Using saved {0} location \"{1}\" to determine what changes to submit."
7117
msgstr ""
7118
7119
#: bzrlib/send.py:98
7120
#, python-format
7121
msgid "No such send format '%s'."
7122
msgstr ""
7123
7124
#: bzrlib/send.py:114
7125
msgid "bzr send takes at most two one revision identifiers"
7126
msgstr ""
7127
7128
#: bzrlib/send.py:127
7129
msgid "No revisions to submit."
7130
msgstr ""
7131
7132
#: bzrlib/send.py:139
7133
msgid ""
7134
"- not supported for merge directives that use more than one output file."
7135
msgstr ""
7136
7137
#: bzrlib/send.py:185
7138
msgid "Format 0.9 does not permit bundle with no patch"
7139
msgstr ""
7140
7141
#: bzrlib/shelf_ui.py:46
7142
#, python-format
7143
msgid "Shelve adding file \"%(path)s\"?"
7144
msgstr ""
7145
7146
#: bzrlib/shelf_ui.py:47
7147
msgid "Shelve binary changes?"
7148
msgstr ""
7149
7150
#: bzrlib/shelf_ui.py:48
7151
msgid "Shelve changing \"%s\" from %(other)s to %(this)s?"
7152
msgstr ""
7153
7154
#: bzrlib/shelf_ui.py:50
7155
#, python-format
7156
msgid "Shelve removing file \"%(path)s\"?"
7157
msgstr ""
7158
7159
#: bzrlib/shelf_ui.py:51
7160
#, python-format
7161
msgid "Shelve %d change(s)?"
7162
msgstr ""
7163
7164
#: bzrlib/shelf_ui.py:52
7165
msgid "Shelve?"
7166
msgstr ""
7167
7168
#: bzrlib/shelf_ui.py:53
7169
#, python-format
7170
msgid ""
7171
"Shelve changing target of \"%(path)s\" from \"%(other)s\" to \"%(this)s\"?"
7172
msgstr ""
7173
7174
#: bzrlib/shelf_ui.py:55
7175
#, python-format
7176
msgid "Shelve renaming \"%(other)s\" => \"%(this)s\"?"
7177
msgstr ""
7178
7179
#: bzrlib/shelf_ui.py:70
7180
#, python-format
7181
msgid "Changes shelved with id \"%d\"."
7182
msgstr ""
7183
7184
#: bzrlib/shelf_ui.py:74
7185
msgid "Selected changes destroyed."
7186
msgstr ""
7187
7188
#: bzrlib/shelf_ui.py:78
7189
msgid "Selected changes:"
7190
msgstr ""
7191
7192
#: bzrlib/shelf_ui.py:98
7193
#, python-format
7194
msgid "Delete file \"%(path)s\"?"
7195
msgstr ""
7196
7197
#: bzrlib/shelf_ui.py:99
7198
msgid "Apply binary changes?"
7199
msgstr ""
7200
7201
#: bzrlib/shelf_ui.py:100
7202
#, python-format
7203
msgid "Change \"%(path)s\" from %(this)s to %(other)s?"
7204
msgstr ""
7205
7206
#: bzrlib/shelf_ui.py:102
7207
#, python-format
7208
msgid "Add file \"%(path)s\"?"
7209
msgstr ""
7210
7211
#: bzrlib/shelf_ui.py:103
7212
#, python-format
7213
msgid "Apply %d change(s)?"
7214
msgstr ""
7215
7216
#: bzrlib/shelf_ui.py:104
7217
msgid "Apply change?"
7218
msgstr ""
7219
7220
#: bzrlib/shelf_ui.py:105
7221
#, python-format
7222
msgid "Change target of \"%(path)s\" from \"%(this)s\" to \"%(other)s\"?"
7223
msgstr ""
7224
7225
#: bzrlib/shelf_ui.py:107
7226
#, python-format
7227
msgid "Rename \"%(this)s\" => \"%(other)s\"?"
7228
msgstr ""
7229
7230
#: bzrlib/shelf_ui.py:402
7231
msgid "No changes are shelved."
7232
msgstr ""
7233
7234
#: bzrlib/shelf_ui.py:460
7235
#, python-format
7236
msgid "Using changes with id \"%d\"."
7237
msgstr ""
7238
7239
#: bzrlib/shelf_ui.py:464
7240
#, python-format
7241
msgid "Message: %s"
7242
msgstr ""
7243
7244
#: bzrlib/shelf_ui.py:476
7245
#, python-format
7246
msgid "Deleted changes with id \"%d\"."
7247
msgstr ""
7248
7249
#: bzrlib/smart/medium.py:714
7250
msgid "HPSS calls: {0} ({1} vfs) {2}"
7251
msgstr ""
7252
7253
#: bzrlib/smart/server.py:169
7254
msgid "Requested to stop gracefully"
7255
msgstr ""
7256
7257
#: bzrlib/smart/server.py:179
7258
#, python-format
7259
msgid "Waiting for %d client(s) to finish"
7260
msgstr ""
7261
7262
#: bzrlib/smart/server.py:185
7263
#, python-format
7264
msgid "Still waiting for %d client(s) to finish"
7265
msgstr ""
7266
7267
#: bzrlib/smart/server.py:219
7268
#, python-format
7269
msgid "listening socket error: %s"
7270
msgstr ""
7271
7272
#: bzrlib/smart/server.py:452
7273
#, python-format
7274
msgid "listening on port: %s"
7275
msgstr ""
7276
7277
#: bzrlib/switch.py:73
7278
msgid "Pending merges must be committed or reverted before using switch."
7279
msgstr ""
7280
7281
#: bzrlib/switch.py:100
7282
msgid ""
7283
"Cannot switch as local commits found in the checkout. Commit these to the "
7284
"bound branch or use --force to throw them away."
7285
msgstr ""
7286
7287
#: bzrlib/switch.py:105
7288
#, python-format
7289
msgid ""
7290
"Unable to connect to current master branch %(target)s: %(error)s To switch "
7291
"anyway, use --force."
7292
msgstr ""
7293
7294
#: bzrlib/switch.py:125
7295
msgid "Cannot switch a branch, only a checkout."
7296
msgstr ""
7297
7298
#: bzrlib/switch.py:163
7299
#, python-format
7300
msgid "Tree is up to date at revision %d."
7301
msgstr ""
7302
7303
#: bzrlib/switch.py:169
7304
#, python-format
7305
msgid "Updated to revision %d."
7306
msgstr ""
7307
7308
#: bzrlib/transform.py:1734 bzrlib/transform.py:1745 bzrlib/transform.py:1747
7309
msgid "Apply phase"
7310
msgstr ""
7311
7312
#: bzrlib/transform.py:1773 bzrlib/transform.py:1841
7313
msgid "removing file"
7314
msgstr ""
7315
7316
#: bzrlib/transform.py:1791 bzrlib/transform.py:1876
7317
msgid "adding file"
7318
msgstr ""
7319
7320
#: bzrlib/transform.py:2591
7321
msgid "Building tree"
7322
msgstr ""
7323
7324
#: bzrlib/transform.py:2681 bzrlib/transform.py:2708
7325
msgid "Adding file contents"
7326
msgstr ""
7327
7328
#: bzrlib/transform.py:3028
7329
msgid "Resolution pass"
7330
msgstr ""
7331
7332
#: bzrlib/transport/ftp/_gssapi.py:88
7333
#, python-format
7334
msgid "Authenticated as %s"
7335
msgstr ""
7336
7337
#: bzrlib/tree.py:634
7338
msgid "*** {0} content-filter: {1} => {2!r}"
7339
msgstr ""
7340
7341
#: bzrlib/upgrade.py:77
7342
#, python-format
7343
msgid "This is a checkout. The branch (%s) needs to be upgraded separately."
7344
msgstr ""
7345
7346
#: bzrlib/upgrade.py:100
7347
#, python-format
7348
msgid "cannot upgrade from bzrdir format %s"
7349
msgstr ""
7350
7351
#: bzrlib/upgrade.py:103
7352
#, python-format
7353
msgid "starting upgrade of %s"
7354
msgstr ""
7355
7356
#: bzrlib/upgrade.py:110
7357
msgid "finished"
7358
msgstr ""
7359
7360
#: bzrlib/upgrade.py:120
7361
msgid "Deleting backup.bzr"
7362
msgstr ""
7363
7364
#: bzrlib/upgrade.py:151
7365
msgid ""
7366
"\n"
7367
"SUMMARY: {0} upgrades attempted, {1} succeeded, {2} failed"
7368
msgstr ""
7369
7370
#: bzrlib/upgrade.py:208
7371
#, python-format
7372
msgid "Found %d dependent branches - upgrading ..."
7373
msgstr ""
7374
7375
#: bzrlib/upgrade.py:276
7376
msgid "Upgrading bzrdirs"
7377
msgstr ""
7378
7379
#: bzrlib/upgrade.py:282
7380
#, python-format
7381
msgid "Upgrading %s"
7382
msgstr ""
7383
7384
#: bzrlib/upgrade.py:283
7385
msgid "Upgrading {0} {1} ..."
7386
msgstr ""
7387
7388
#: bzrlib/upgrade.py:301
7389
msgid "Removing backup ..."
7390
msgstr ""
7391
7392
#: bzrlib/upgrade.py:305
7393
msgid "failed to clean-up {0}: {1}"
7394
msgstr ""
7395
7396
#: bzrlib/vf_repository.py:1090
7397
msgid "inventories"
7398
msgstr ""
7399
7400
#: bzrlib/vf_repository.py:1116
7401
msgid "texts"
7402
msgstr ""
7403
7404
#: bzrlib/vf_repository.py:1621 bzrlib/vf_repository.py:1630
7405
msgid "Calculating text parents"
7406
msgstr ""
7407
7408
#: bzrlib/vf_repository.py:1706
7409
msgid "Fetch texts"
7410
msgstr ""
7411
7412
#: bzrlib/vf_repository.py:2535
7413
msgid "loading text store"
7414
msgstr ""
7415
7416
#: bzrlib/vf_repository.py:2541
7417
msgid "checking text graph"
7418
msgstr ""
7419
7420
#: bzrlib/vf_repository.py:2995 bzrlib/vf_repository.py:3009
7421
#: bzrlib/vf_repository.py:3124
7422
msgid "Transferring revisions"
7423
msgstr ""
7424
7425
#: bzrlib/win32utils.py:146
7426
msgid "Failed to GetProcessMemoryInfo()"
7427
msgstr ""
7428
7429
#: bzrlib/win32utils.py:167
7430
msgid "Cannot debug memory on win32 without ctypes or win32process"
7431
msgstr ""
7432
7433
#: bzrlib/win32utils.py:172
7434
msgid "WorkingSize {0:>7}KiB\tPeakWorking {1:>7}KiB\t{2}"
7435
msgstr ""
7436
7437
#: bzrlib/win32utils.py:180
7438
#, python-format
7439
msgid "WorkingSize %8d KiB"
7440
msgstr ""
7441
7442
#: bzrlib/win32utils.py:181
7443
#, python-format
7444
msgid "PeakWorking %8d KiB"
7445
msgstr ""
7446
7447
#: bzrlib/win32utils.py:182
7448
#, python-format
7449
msgid "PagefileUsage %8d KiB"
7450
msgstr ""
7451
7452
#: bzrlib/win32utils.py:183
7453
#, python-format
7454
msgid "PeakPagefileUsage %8d KiB"
7455
msgstr ""
7456
7457
#: bzrlib/win32utils.py:185
7458
#, python-format
7459
msgid "PrivateUsage %8d KiB"
7460
msgstr ""
7461
7462
#: bzrlib/win32utils.py:186
7463
#, python-format
7464
msgid "PageFaultCount %8d"
7465
msgstr ""
7466
7467
#: bzrlib/workingtree.py:1478
7468
msgid "Rerun update after fixing the conflicts."
7469
msgstr ""
7470
7471
#: dummy/help_topics/authentication/summary.txt:1
7472
msgid "Information on configuring authentication"
7473
msgstr ""
7474
7475
#: dummy/help_topics/basic/detail.txt:1
7476
msgid ""
7477
"Bazaar 2.5b6 -- a free distributed version-control tool\n"
7478
"http://bazaar.canonical.com/"
7479
msgstr ""
7480
7481
#: dummy/help_topics/basic/detail.txt:4
7482
msgid ""
7483
"Basic commands:\n"
7484
" bzr init makes this directory a versioned branch\n"
7485
" bzr branch make a copy of another branch"
7486
msgstr ""
7487
7488
#: dummy/help_topics/basic/detail.txt:8
7489
msgid ""
7490
" bzr add make files or directories versioned\n"
7491
" bzr ignore ignore a file or pattern\n"
7492
" bzr mv move or rename a versioned file"
7493
msgstr ""
7494
7495
#: dummy/help_topics/basic/detail.txt:12
7496
msgid ""
7497
" bzr status summarize changes in working copy\n"
7498
" bzr diff show detailed diffs"
7499
msgstr ""
7500
7501
#: dummy/help_topics/basic/detail.txt:15
7502
msgid ""
7503
" bzr merge pull in changes from another branch\n"
7504
" bzr commit save some or all changes\n"
7505
" bzr send send changes via email"
7506
msgstr ""
7507
7508
#: dummy/help_topics/basic/detail.txt:19
7509
msgid ""
7510
" bzr log show history of changes\n"
7511
" bzr check validate storage"
7512
msgstr ""
7513
7514
#: dummy/help_topics/basic/detail.txt:22
7515
msgid ""
7516
" bzr help init more help on e.g. init command\n"
7517
" bzr help commands list all commands\n"
7518
" bzr help topics list all help topics\n"
7519
msgstr ""
7520
7521
#: dummy/help_topics/basic/summary.txt:1
7522
msgid "Basic commands"
7523
msgstr ""
7524
7525
#: dummy/help_topics/branches/detail.txt:1
7526
msgid "Branches"
7527
msgstr ""
7528
7529
#: dummy/help_topics/branches/detail.txt:3
7530
msgid ""
7531
"A branch consists of the state of a project, including all of its\n"
7532
"history. All branches have a repository associated (which is where the\n"
7533
"branch history is stored), but multiple branches may share the same\n"
7534
"repository (a shared repository). Branches can be copied and merged."
7535
msgstr ""
7536
7537
#: dummy/help_topics/branches/detail.txt:8
7538
msgid ""
7539
"In addition, one branch may be bound to another one. Binding to another\n"
7540
"branch indicates that commits which happen in this branch must also \n"
7541
"happen in the other branch. Bazaar ensures consistency by not allowing \n"
7542
"commits when the two branches are out of date. In order for a commit \n"
7543
"to succeed, it may be necessary to update the current branch using \n"
7544
"``bzr update``."
7545
msgstr ""
7546
7547
#: dummy/help_topics/branches/detail.txt:15
7548
#: dummy/help_topics/checkouts/detail.txt:66
7549
#: dummy/help_topics/repositories/detail.txt:36
7550
msgid "Related commands::"
7551
msgstr ""
7552
7553
#: dummy/help_topics/branches/detail.txt:17
7554
msgid ""
7555
" init Change a directory into a versioned branch.\n"
7556
" branch Create a new branch that is a copy of an existing branch.\n"
7557
" merge Perform a three-way merge.\n"
7558
" bind Bind a branch to another one.\n"
7559
msgstr ""
7560
7561
#: dummy/help_topics/branches/summary.txt:1
7562
msgid "Information on what a branch is"
7563
msgstr ""
7564
7565
#: dummy/help_topics/bugs/summary.txt:1
7566
msgid "Bug tracker settings"
7567
msgstr ""
7568
7569
#: dummy/help_topics/checkouts/detail.txt:1
7570
msgid "Checkouts"
7571
msgstr ""
7572
7573
#: dummy/help_topics/checkouts/detail.txt:3
7574
msgid ""
7575
"Checkouts are source trees that are connected to a branch, so that when\n"
7576
"you commit in the source tree, the commit goes into that branch. They\n"
7577
"allow you to use a simpler, more centralized workflow, ignoring some of\n"
7578
"Bazaar's decentralized features until you want them. Using checkouts\n"
7579
"with shared repositories is very similar to working with SVN or CVS, but\n"
7580
"doesn't have the same restrictions. And using checkouts still allows\n"
7581
"others working on the project to use whatever workflow they like."
7582
msgstr ""
7583
7584
#: dummy/help_topics/checkouts/detail.txt:11
7585
msgid ""
7586
"A checkout is created with the bzr checkout command (see \"help "
7587
"checkout\").\n"
7588
"You pass it a reference to another branch, and it will create a local copy\n"
7589
"for you that still contains a reference to the branch you created the\n"
7590
"checkout from (the master branch). Then if you make any commits they will "
7591
"be\n"
7592
"made on the other branch first. This creates an instant mirror of your work, "
7593
"or\n"
7594
"facilitates lockstep development, where each developer is working together,\n"
7595
"continuously integrating the changes of others."
7596
msgstr ""
7597
7598
#: dummy/help_topics/checkouts/detail.txt:19
7599
msgid ""
7600
"However the checkout is still a first class branch in Bazaar terms, so that\n"
7601
"you have the full history locally. As you have a first class branch you "
7602
"can\n"
7603
"also commit locally if you want, for instance due to the temporary loss af "
7604
"a\n"
7605
"network connection. Use the --local option to commit to do this. All the "
7606
"local\n"
7607
"commits will then be made on the master branch the next time you do a non-"
7608
"local\n"
7609
"commit."
7610
msgstr ""
7611
7612
#: dummy/help_topics/checkouts/detail.txt:26
7613
msgid ""
7614
"If you are using a checkout from a shared branch you will periodically want "
7615
"to\n"
7616
"pull in all the changes made by others. This is done using the \"update\"\n"
7617
"command. The changes need to be applied before any non-local commit, but\n"
7618
"Bazaar will tell you if there are any changes and suggest that you use this\n"
7619
"command when needed."
7620
msgstr ""
7621
7622
#: dummy/help_topics/checkouts/detail.txt:32
7623
msgid ""
7624
"It is also possible to create a \"lightweight\" checkout by passing the\n"
7625
"--lightweight flag to checkout. A lightweight checkout is even closer to an\n"
7626
"SVN checkout in that it is not a first class branch, it mainly consists of "
7627
"the\n"
7628
"working tree. This means that any history operations must query the master\n"
7629
"branch, which could be slow if a network connection is involved. Also, as "
7630
"you\n"
7631
"don't have a local branch, then you cannot commit locally."
7632
msgstr ""
7633
7634
#: dummy/help_topics/checkouts/detail.txt:39
7635
msgid ""
7636
"Lightweight checkouts work best when you have fast reliable access to the\n"
7637
"master branch. This means that if the master branch is on the same disk or "
7638
"LAN\n"
7639
"a lightweight checkout will be faster than a heavyweight one for any "
7640
"commands\n"
7641
"that modify the revision history (as only one copy of the branch needs to\n"
7642
"be updated). Heavyweight checkouts will generally be faster for any command\n"
7643
"that uses the history but does not change it, but if the master branch is "
7644
"on\n"
7645
"the same disk then there won't be a noticeable difference."
7646
msgstr ""
7647
7648
#: dummy/help_topics/checkouts/detail.txt:47
7649
msgid ""
7650
"Another possible use for a checkout is to use it with a treeless repository\n"
7651
"containing your branches, where you maintain only one working tree by\n"
7652
"switching the master branch that the checkout points to when you want to\n"
7653
"work on a different branch."
7654
msgstr ""
7655
7656
#: dummy/help_topics/checkouts/detail.txt:52
7657
msgid ""
7658
"Obviously to commit on a checkout you need to be able to write to the "
7659
"master\n"
7660
"branch. This means that the master branch must be accessible over a "
7661
"writeable\n"
7662
"protocol , such as sftp://, and that you have write permissions at the "
7663
"other\n"
7664
"end. Checkouts also work on the local file system, so that all that matters "
7665
"is\n"
7666
"file permissions."
7667
msgstr ""
7668
7669
#: dummy/help_topics/checkouts/detail.txt:58
7670
msgid ""
7671
"You can change the master of a checkout by using the \"switch\" command "
7672
"(see\n"
7673
"\"help switch\"). This will change the location that the commits are sent "
7674
"to.\n"
7675
"The \"bind\" command can also be used to turn a normal branch into a heavy\n"
7676
"checkout. If you would like to convert your heavy checkout into a normal\n"
7677
"branch so that every commit is local, you can use the \"unbind\" command. To "
7678
"see\n"
7679
"whether or not a branch is bound or not you can use the \"info\" command. If "
7680
"the\n"
7681
"branch is bound it will tell you the location of the bound branch."
7682
msgstr ""
7683
7684
#: dummy/help_topics/checkouts/detail.txt:68
7685
msgid ""
7686
" checkout Create a checkout. Pass --lightweight to get a lightweight\n"
7687
" checkout\n"
7688
" update Pull any changes in the master branch in to your checkout\n"
7689
" commit Make a commit that is sent to the master branch. If you have\n"
7690
" a heavy checkout then the --local option will commit to the\n"
7691
" checkout without sending the commit to the master\n"
7692
" switch Change the master branch that the commits in the checkout "
7693
"will\n"
7694
" be sent to\n"
7695
" bind Turn a standalone branch into a heavy checkout so that any\n"
7696
" commits will be sent to the master branch\n"
7697
" unbind Turn a heavy checkout into a standalone branch so that any\n"
7698
" commits are only made locally\n"
7699
" info Displays whether a branch is bound or unbound. If the branch "
7700
"is\n"
7701
" bound, then it will also display the location of the bound "
7702
"branch\n"
7703
msgstr ""
7704
7705
#: dummy/help_topics/checkouts/summary.txt:1
7706
msgid "Information on what a checkout is"
7707
msgstr ""
7708
7709
#: dummy/help_topics/commands/summary.txt:1
7710
msgid "Basic help for all commands"
7711
msgstr ""
7712
7713
#: dummy/help_topics/configuration/summary.txt:1
7714
msgid "Details on the configuration settings available"
7715
msgstr ""
7716
7717
#: dummy/help_topics/conflict-types/summary.txt:1
7718
msgid "Types of conflicts and what to do about them"
7719
msgstr ""
7720
7721
#: dummy/help_topics/content-filters/summary.txt:1
7722
msgid "Conversion of content into/from working trees"
7723
msgstr ""
7724
7725
#: dummy/help_topics/criss-cross/detail.txt:1
7726
msgid "Criss-Cross"
7727
msgstr ""
7728
7729
#: dummy/help_topics/criss-cross/detail.txt:3
7730
msgid ""
7731
"A criss-cross in the branch history can cause the default merge technique\n"
7732
"to emit more conflicts than would normally be expected."
7733
msgstr ""
7734
7735
#: dummy/help_topics/criss-cross/detail.txt:6
7736
msgid ""
7737
"In complex merge cases, ``bzr merge --lca`` or ``bzr merge --weave`` may "
7738
"give\n"
7739
"better results. You may wish to ``bzr revert`` the working tree and merge\n"
7740
"again. Alternatively, use ``bzr remerge`` on particular conflicted files."
7741
msgstr ""
7742
7743
#: dummy/help_topics/criss-cross/detail.txt:10
7744
msgid ""
7745
"Criss-crosses occur in a branch's history if two branches merge the same "
7746
"thing\n"
7747
"and then merge one another, or if two branches merge one another at the "
7748
"same\n"
7749
"time. They can be avoided by having each branch only merge from or into a\n"
7750
"designated central branch (a \"star topology\")."
7751
msgstr ""
7752
7753
#: dummy/help_topics/criss-cross/detail.txt:15
7754
msgid ""
7755
"Criss-crosses cause problems because of the way merge works. Bazaar's "
7756
"default\n"
7757
"merge is a three-way merger; in order to merge OTHER into THIS, it must\n"
7758
"find a basis for comparison, BASE. Using BASE, it can determine whether\n"
7759
"differences between THIS and OTHER are due to one side adding lines, or\n"
7760
"from another side removing lines."
7761
msgstr ""
7762
7763
#: dummy/help_topics/criss-cross/detail.txt:21
7764
msgid ""
7765
"Criss-crosses mean there is no good choice for a base. Selecting the "
7766
"recent\n"
7767
"merge points could cause one side's changes to be silently discarded.\n"
7768
"Selecting older merge points (which Bazaar does) mean that extra conflicts\n"
7769
"are emitted."
7770
msgstr ""
7771
7772
#: dummy/help_topics/criss-cross/detail.txt:26
7773
msgid ""
7774
"The ``weave`` merge type is not affected by this problem because it uses\n"
7775
"line-origin detection instead of a basis revision to determine the cause of\n"
7776
"differences.\n"
7777
msgstr ""
7778
7779
#: dummy/help_topics/criss-cross/summary.txt:1
7780
msgid "Information on criss-cross merging"
7781
msgstr ""
7782
7783
#: dummy/help_topics/current-formats/summary.txt:1
7784
msgid "Current storage formats"
7785
msgstr ""
7786
7787
#: dummy/help_topics/debug-flags/summary.txt:1
7788
msgid "Options to show or record debug information"
7789
msgstr ""
7790
7791
#: dummy/help_topics/diverged-branches/summary.txt:1
7792
msgid "How to fix diverged branches"
7793
msgstr ""
7794
7795
#: dummy/help_topics/env-variables/detail.txt:1
7796
msgid "Environment Variables"
7797
msgstr ""
7798
7799
#: dummy/help_topics/env-variables/detail.txt:3
7800
msgid ""
7801
"=================== "
7802
"===========================================================\n"
7803
"BZRPATH Path where bzr is to look for shell plugin external\n"
7804
" commands.\n"
7805
"BZR_EMAIL E-Mail address of the user. Overrides EMAIL.\n"
7806
"EMAIL E-Mail address of the user.\n"
7807
"BZR_EDITOR Editor for editing commit messages. Overrides EDITOR.\n"
7808
"EDITOR Editor for editing commit messages.\n"
7809
"BZR_PLUGIN_PATH Paths where bzr should look for plugins.\n"
7810
"BZR_DISABLE_PLUGINS Plugins that bzr should not load.\n"
7811
"BZR_PLUGINS_AT Plugins to load from a directory not in "
7812
"BZR_PLUGIN_PATH.\n"
7813
"BZR_HOME Directory holding .bazaar config dir. Overrides HOME.\n"
7814
"BZR_HOME (Win32) Directory holding bazaar config dir. Overrides APPDATA "
7815
"and\n"
7816
" HOME.\n"
7817
"BZR_REMOTE_PATH Full name of remote 'bzr' command (for bzr+ssh:// "
7818
"URLs).\n"
7819
"BZR_SSH Path to SSH client, or one of paramiko, openssh, "
7820
"sshcorp,\n"
7821
" plink or lsh.\n"
7822
"BZR_LOG Location of .bzr.log (use '/dev/null' to suppress log).\n"
7823
"BZR_LOG (Win32) Location of .bzr.log (use 'NUL' to suppress log).\n"
7824
"BZR_COLUMNS Override implicit terminal width.\n"
7825
"BZR_CONCURRENCY Number of processes that can be run concurrently "
7826
"(selftest)\n"
7827
"BZR_PROGRESS_BAR Override the progress display. Values are 'none' or "
7828
"'text'.\n"
7829
"BZR_PDB Control whether to launch a debugger on error.\n"
7830
"BZR_SIGQUIT_PDB Control whether SIGQUIT behaves normally or invokes a\n"
7831
" breakin debugger.\n"
7832
"BZR_TEXTUI_INPUT Force console input mode for prompts to line-based "
7833
"(instead\n"
7834
" of char-based).\n"
7835
"=================== "
7836
"===========================================================\n"
7837
msgstr ""
7838
7839
#: dummy/help_topics/env-variables/summary.txt:1
7840
msgid "Environment variable names and values"
7841
msgstr ""
7842
7843
#: dummy/help_topics/eol/summary.txt:1
7844
msgid "Information on end-of-line handling"
7845
msgstr ""
7846
7847
#: dummy/help_topics/files/detail.txt:1
7848
msgid "Files"
7849
msgstr ""
7850
7851
#: dummy/help_topics/files/detail.txt:3
7852
msgid ""
7853
":On Unix: ~/.bazaar/bazaar.conf\n"
7854
":On Windows: C:\\\\Documents and Settings\\\\username\\\\Application Data\\\\"
7855
"bazaar\\\\2.0\\\\bazaar.conf"
7856
msgstr ""
7857
7858
#: dummy/help_topics/files/detail.txt:6
7859
msgid ""
7860
"Contains the user's default configuration. The section ``[DEFAULT]`` is\n"
7861
"used to define general configuration that will be applied everywhere.\n"
7862
"The section ``[ALIASES]`` can be used to create command aliases for\n"
7863
"commonly used options."
7864
msgstr ""
7865
7866
#: dummy/help_topics/files/detail.txt:11
7867
msgid "A typical config file might look something like::"
7868
msgstr ""
7869
7870
#: dummy/help_topics/files/detail.txt:13
7871
msgid ""
7872
" [DEFAULT]\n"
7873
" email=John Doe <jdoe@isp.com>"
7874
msgstr ""
7875
7876
#: dummy/help_topics/files/detail.txt:16
7877
msgid ""
7878
" [ALIASES]\n"
7879
" commit = commit --strict\n"
7880
" log10 = log --short -r -10..-1\n"
7881
msgstr ""
7882
7883
#: dummy/help_topics/files/summary.txt:1
7884
msgid "Information on configuration and log files"
7885
msgstr ""
7886
7887
#: dummy/help_topics/formats/detail.txt:1
7888
msgid "Storage Formats"
7889
msgstr ""
7890
7891
#: dummy/help_topics/formats/detail.txt:3
7892
msgid ""
7893
"To ensure that older clients do not access data incorrectly,\n"
7894
"Bazaar's policy is to introduce a new storage format whenever\n"
7895
"new features requiring new metadata are added. New storage\n"
7896
"formats may also be introduced to improve performance and\n"
7897
"scalability."
7898
msgstr ""
7899
7900
#: dummy/help_topics/formats/detail.txt:9
7901
msgid ""
7902
"The newest format, 2a, is highly recommended. If your\n"
7903
"project is not using 2a, then you should suggest to the\n"
7904
"project owner to upgrade."
7905
msgstr ""
7906
7907
#: dummy/help_topics/formats/detail.txt:13
7908
msgid ""
7909
"\n"
7910
".. note::"
7911
msgstr ""
7912
7913
#: dummy/help_topics/formats/detail.txt:16
7914
msgid ""
7915
" Some of the older formats have two variants:\n"
7916
" a plain one and a rich-root one. The latter include an additional\n"
7917
" field about the root of the tree. There is no performance cost\n"
7918
" for using a rich-root format but you cannot easily merge changes\n"
7919
" from a rich-root format into a plain format. As a consequence,\n"
7920
" moving a project to a rich-root format takes some co-ordination\n"
7921
" in that all contributors need to upgrade their repositories\n"
7922
" around the same time. 2a and all future formats will be\n"
7923
" implicitly rich-root."
7924
msgstr ""
7925
7926
#: dummy/help_topics/formats/detail.txt:26
7927
msgid ""
7928
"See :doc:`current-formats-help` for the complete list of\n"
7929
"currently supported formats. See :doc:`other-formats-help` for\n"
7930
"descriptions of any available experimental and deprecated formats.\n"
7931
msgstr ""
7932
7933
#: dummy/help_topics/formats/summary.txt:1
7934
msgid "Information on choosing a storage format"
7935
msgstr ""
7936
7937
#: dummy/help_topics/global-options/detail.txt:1
7938
msgid "Global Options"
7939
msgstr ""
7940
7941
#: dummy/help_topics/global-options/detail.txt:3
7942
msgid ""
7943
"These options may be used with any command, and may appear in front of any\n"
7944
"command. (e.g. ``bzr --profile help``)."
7945
msgstr ""
7946
7947
#: dummy/help_topics/global-options/detail.txt:6
7948
msgid ""
7949
"--version Print the version number. Must be supplied before the "
7950
"command.\n"
7951
"--no-aliases Do not process command aliases when running this command.\n"
7952
"--builtin Use the built-in version of a command, not the plugin "
7953
"version.\n"
7954
" This does not suppress other plugin effects.\n"
7955
"--no-plugins Do not process any plugins.\n"
7956
"--no-l10n Do not translate messages.\n"
7957
"--concurrency Number of processes that can be run concurrently (selftest)."
7958
msgstr ""
7959
7960
#: dummy/help_topics/global-options/detail.txt:14
7961
msgid ""
7962
"--profile Profile execution using the hotshot profiler.\n"
7963
"--lsprof Profile execution using the lsprof profiler.\n"
7964
"--lsprof-file Profile execution using the lsprof profiler, and write the\n"
7965
" results to a specified file. If the filename ends with "
7966
"\".txt\",\n"
7967
" text format will be used. If the filename either starts "
7968
"with\n"
7969
" \"callgrind.out\" or end with \".callgrind\", the output will "
7970
"be\n"
7971
" formatted for use with KCacheGrind. Otherwise, the output\n"
7972
" will be a pickle.\n"
7973
"--coverage Generate line coverage report in the specified directory."
7974
msgstr ""
7975
7976
#: dummy/help_topics/global-options/detail.txt:24
7977
msgid ""
7978
"-Oname=value Override the ``name`` config option setting it to ``value`` "
7979
"for\n"
7980
" the duration of the command. This can be used multiple times "
7981
"if\n"
7982
" several options need to be overridden."
7983
msgstr ""
7984
7985
#: dummy/help_topics/global-options/detail.txt:28
7986
msgid ""
7987
"See http://doc.bazaar.canonical.com/developers/profiling.html for more\n"
7988
"information on profiling."
7989
msgstr ""
7990
7991
#: dummy/help_topics/global-options/detail.txt:31
7992
msgid ""
7993
"A number of debug flags are also available to assist troubleshooting and\n"
7994
"development. See :doc:`debug-flags-help`.\n"
7995
msgstr ""
7996
7997
#: dummy/help_topics/global-options/summary.txt:1
7998
msgid "Options that control how Bazaar runs"
7999
msgstr ""
8000
8001
#: dummy/help_topics/hidden-commands/summary.txt:1
8002
msgid "All hidden commands"
8003
msgstr ""
8004
8005
#: dummy/help_topics/hooks/summary.txt:1
8006
msgid "Points at which custom processing can be added"
8007
msgstr ""
8008
8009
#: dummy/help_topics/launchpad/detail.txt:1
8010
msgid "Integration with Launchpad.net"
8011
msgstr ""
8012
8013
#: dummy/help_topics/launchpad/detail.txt:3
8014
msgid ""
8015
"Launchpad.net provides free Bazaar branch hosting with integrated bug and\n"
8016
"specification tracking."
8017
msgstr ""
8018
8019
#: dummy/help_topics/launchpad/detail.txt:6
8020
msgid ""
8021
"The bzr client (through the plugin called 'launchpad') has special\n"
8022
"features to communicate with Launchpad:"
8023
msgstr ""
8024
8025
#: dummy/help_topics/launchpad/detail.txt:9
8026
msgid ""
8027
" * The launchpad-login command tells Bazaar your Launchpad user name. "
8028
"This\n"
8029
" is then used by the 'lp:' transport to download your branches using\n"
8030
" bzr+ssh://."
8031
msgstr ""
8032
8033
#: dummy/help_topics/launchpad/detail.txt:13
8034
msgid ""
8035
" * The 'lp:' transport uses Launchpad as a directory service: for "
8036
"example\n"
8037
" 'lp:bzr' and 'lp:python' refer to the main branches of the relevant\n"
8038
" projects and may be branched, logged, etc. You can also use the 'lp:'\n"
8039
" transport to refer to specific branches, e.g. lp:~bzr/bzr/trunk."
8040
msgstr ""
8041
8042
#: dummy/help_topics/launchpad/detail.txt:18
8043
msgid ""
8044
" * The 'lp:' bug tracker alias can expand launchpad bug numbers to their\n"
8045
" URLs for use with 'bzr commit --fixes', e.g. 'bzr commit --fixes "
8046
"lp:12345'\n"
8047
" will record a revision property that marks that revision as fixing\n"
8048
" Launchpad bug 12345. When you push that branch to Launchpad it will\n"
8049
" automatically be linked to the bug report."
8050
msgstr ""
8051
8052
#: dummy/help_topics/launchpad/detail.txt:24
8053
msgid ""
8054
" * The register-branch command tells Launchpad about the url of a\n"
8055
" public branch. Launchpad will then mirror the branch, display\n"
8056
" its contents and allow it to be attached to bugs and other\n"
8057
" objects."
8058
msgstr ""
8059
8060
#: dummy/help_topics/launchpad/detail.txt:29
8061
msgid "For more information see http://help.launchpad.net/\n"
8062
msgstr ""
8063
8064
#: dummy/help_topics/launchpad/summary.txt:1
8065
msgid "Using Bazaar with Launchpad.net"
8066
msgstr ""
8067
8068
#: dummy/help_topics/location-alias/summary.txt:1
8069
msgid "Aliases for remembered locations"
8070
msgstr ""
8071
8072
#: dummy/help_topics/log-formats/summary.txt:1
8073
msgid "Details on the logging formats available"
8074
msgstr ""
8075
8076
#: dummy/help_topics/other-formats/summary.txt:1
8077
msgid "Experimental and deprecated storage formats"
8078
msgstr ""
8079
8080
#: dummy/help_topics/patterns/summary.txt:1
8081
msgid "Information on the pattern syntax"
8082
msgstr ""
8083
8084
#: dummy/help_topics/repositories/detail.txt:1
8085
msgid "Repositories"
8086
msgstr ""
8087
8088
#: dummy/help_topics/repositories/detail.txt:3
8089
msgid ""
8090
"Repositories in Bazaar are where committed information is stored. There is\n"
8091
"a repository associated with every branch."
8092
msgstr ""
8093
8094
#: dummy/help_topics/repositories/detail.txt:6
8095
msgid ""
8096
"Repositories are a form of database. Bzr will usually maintain this for\n"
8097
"good performance automatically, but in some situations (e.g. when doing\n"
8098
"very many commits in a short time period) you may want to ask bzr to\n"
8099
"optimise the database indices. This can be done by the 'bzr pack' command."
8100
msgstr ""
8101
8102
#: dummy/help_topics/repositories/detail.txt:11
8103
msgid ""
8104
"By default just running 'bzr init' will create a repository within the new\n"
8105
"branch but it is possible to create a shared repository which allows "
8106
"multiple\n"
8107
"branches to share their information in the same location. When a new branch "
8108
"is\n"
8109
"created it will first look to see if there is a containing shared repository "
8110
"it\n"
8111
"can use."
8112
msgstr ""
8113
8114
#: dummy/help_topics/repositories/detail.txt:17
8115
msgid ""
8116
"When two branches of the same project share a repository, there is\n"
8117
"generally a large space saving. For some operations (e.g. branching\n"
8118
"within the repository) this translates in to a large time saving."
8119
msgstr ""
8120
8121
#: dummy/help_topics/repositories/detail.txt:21
8122
msgid ""
8123
"To create a shared repository use the init-repository command (or the alias\n"
8124
"init-repo). This command takes the location of the repository to create. "
8125
"This\n"
8126
"means that 'bzr init-repository repo' will create a directory named 'repo',\n"
8127
"which contains a shared repository. Any new branches that are created in "
8128
"this\n"
8129
"directory will then use it for storage."
8130
msgstr ""
8131
8132
#: dummy/help_topics/repositories/detail.txt:27
8133
msgid ""
8134
"It is a good idea to create a repository whenever you might create more\n"
8135
"than one branch of a project. This is true for both working areas where you\n"
8136
"are doing the development, and any server areas that you use for hosting\n"
8137
"projects. In the latter case, it is common to want branches without working\n"
8138
"trees. Since the files in the branch will not be edited directly there is "
8139
"no\n"
8140
"need to use up disk space for a working tree. To create a repository in "
8141
"which\n"
8142
"the branches will not have working trees pass the '--no-trees' option to\n"
8143
"'init-repository'."
8144
msgstr ""
8145
8146
#: dummy/help_topics/repositories/detail.txt:38
8147
msgid ""
8148
" init-repository Create a shared repository. Use --no-trees to create "
8149
"one\n"
8150
" in which new branches won't get a working tree.\n"
8151
msgstr ""
8152
8153
#: dummy/help_topics/repositories/summary.txt:1
8154
msgid "Basic information on shared repositories."
8155
msgstr ""
8156
8157
#: dummy/help_topics/revisionspec/summary.txt:1
8158
msgid "Explain how to use --revision"
8159
msgstr ""
8160
8161
#: dummy/help_topics/rules/summary.txt:1
8162
msgid "Information on defining rule-based preferences"
8163
msgstr ""
8164
8165
#: dummy/help_topics/standalone-trees/detail.txt:1
8166
msgid "Standalone Trees"
8167
msgstr ""
8168
8169
#: dummy/help_topics/standalone-trees/detail.txt:3
8170
msgid ""
8171
"A standalone tree is a working tree with an associated repository. It\n"
8172
"is an independently usable branch, with no dependencies on any other.\n"
8173
"Creating a standalone tree (via bzr init) is the quickest way to put\n"
8174
"an existing project under version control."
8175
msgstr ""
8176
8177
#: dummy/help_topics/standalone-trees/detail.txt:8
8178
msgid "Related Commands::"
8179
msgstr ""
8180
8181
#: dummy/help_topics/standalone-trees/detail.txt:10
8182
msgid " init Make a directory into a versioned branch.\n"
8183
msgstr ""
8184
8185
#: dummy/help_topics/standalone-trees/summary.txt:1
8186
msgid "Information on what a standalone tree is"
8187
msgstr ""
8188
8189
#: dummy/help_topics/standard-options/detail.txt:1
8190
msgid "Standard Options"
8191
msgstr ""
8192
8193
#: dummy/help_topics/standard-options/detail.txt:3
8194
msgid "Standard options are legal for all commands."
8195
msgstr ""
8196
8197
#: dummy/help_topics/standard-options/detail.txt:5
8198
msgid ""
8199
"--help, -h Show help message.\n"
8200
"--verbose, -v Display more information.\n"
8201
"--quiet, -q Only display errors and warnings."
8202
msgstr ""
8203
8204
#: dummy/help_topics/standard-options/detail.txt:9
8205
msgid "Unlike global options, standard options can be used in aliases.\n"
8206
msgstr ""
8207
8208
#: dummy/help_topics/standard-options/summary.txt:1
8209
msgid "Options that can be used with any command"
8210
msgstr ""
8211
8212
#: dummy/help_topics/status-flags/detail.txt:1
8213
msgid "Status Flags"
8214
msgstr ""
8215
8216
#: dummy/help_topics/status-flags/detail.txt:3
8217
msgid ""
8218
"Status flags are used to summarise changes to the working tree in a concise\n"
8219
"manner. They are in the form::"
8220
msgstr ""
8221
8222
#: dummy/help_topics/status-flags/detail.txt:6
8223
msgid " xxx <filename>"
8224
msgstr ""
8225
8226
#: dummy/help_topics/status-flags/detail.txt:8
8227
msgid "where the columns' meanings are as follows."
8228
msgstr ""
8229
8230
#: dummy/help_topics/status-flags/detail.txt:10
8231
msgid "Column 1 - versioning/renames::"
8232
msgstr ""
8233
8234
#: dummy/help_topics/status-flags/detail.txt:12
8235
msgid ""
8236
" + File versioned\n"
8237
" - File unversioned\n"
8238
" R File renamed\n"
8239
" ? File unknown\n"
8240
" X File nonexistent (and unknown to bzr)\n"
8241
" C File has conflicts\n"
8242
" P Entry for a pending merge (not a file)"
8243
msgstr ""
8244
8245
#: dummy/help_topics/status-flags/detail.txt:20
8246
msgid "Column 2 - contents::"
8247
msgstr ""
8248
8249
#: dummy/help_topics/status-flags/detail.txt:22
8250
msgid ""
8251
" N File created\n"
8252
" D File deleted\n"
8253
" K File kind changed\n"
8254
" M File modified"
8255
msgstr ""
8256
8257
#: dummy/help_topics/status-flags/detail.txt:27
8258
msgid "Column 3 - execute::"
8259
msgstr ""
8260
8261
#: dummy/help_topics/status-flags/detail.txt:29
8262
msgid " * The execute bit was changed\n"
8263
msgstr ""
8264
8265
#: dummy/help_topics/status-flags/summary.txt:1
8266
msgid "Help on status flags"
8267
msgstr ""
8268
8269
#: dummy/help_topics/sync-for-reconfigure/detail.txt:1
8270
msgid "Branches Out of Sync"
8271
msgstr ""
8272
8273
#: dummy/help_topics/sync-for-reconfigure/detail.txt:3
8274
msgid ""
8275
"When reconfiguring a checkout, tree or branch into a lightweight checkout,\n"
8276
"a local branch must be destroyed. (For checkouts, this is the local branch\n"
8277
"that serves primarily as a cache.) If the branch-to-be-destroyed does not\n"
8278
"have the same last revision as the new reference branch for the lightweight\n"
8279
"checkout, data could be lost, so Bazaar refuses."
8280
msgstr ""
8281
8282
#: dummy/help_topics/sync-for-reconfigure/detail.txt:9
8283
msgid "How you deal with this depends on *why* the branches are out of sync."
8284
msgstr ""
8285
8286
#: dummy/help_topics/sync-for-reconfigure/detail.txt:11
8287
msgid ""
8288
"If you have a checkout and have done local commits, you can get back in "
8289
"sync\n"
8290
"by running \"bzr update\" (and possibly \"bzr commit\")."
8291
msgstr ""
8292
8293
#: dummy/help_topics/sync-for-reconfigure/detail.txt:14
8294
msgid ""
8295
"If you have a branch and the remote branch is out-of-date, you can push\n"
8296
"the local changes using \"bzr push\". If the local branch is out of date, "
8297
"you\n"
8298
"can do \"bzr pull\". If both branches have had changes, you can merge, "
8299
"commit\n"
8300
"and then push your changes. If you decide that some of the changes aren't\n"
8301
"useful, you can \"push --overwrite\" or \"pull --overwrite\" instead.\n"
8302
msgstr ""
8303
8304
#: dummy/help_topics/sync-for-reconfigure/summary.txt:1
8305
msgid "Steps to resolve \"out-of-sync\" when reconfiguring"
8306
msgstr ""
8307
8308
#: dummy/help_topics/topics/summary.txt:1
8309
msgid "Topics list"
8310
msgstr ""
8311
8312
#: dummy/help_topics/url-special-chars/summary.txt:1
8313
msgid "Special character handling in URLs"
8314
msgstr ""
8315
8316
#: dummy/help_topics/urlspec/summary.txt:1
8317
msgid "Supported transport protocols"
8318
msgstr ""
8319
8320
#: dummy/help_topics/working-trees/detail.txt:1
8321
msgid "Working Trees"
8322
msgstr ""
8323
8324
#: dummy/help_topics/working-trees/detail.txt:3
8325
msgid ""
8326
"A working tree is the contents of a branch placed on disk so that you can\n"
8327
"see the files and edit them. The working tree is where you make changes to "
8328
"a\n"
8329
"branch, and when you commit the current state of the working tree is the\n"
8330
"snapshot that is recorded in the commit."
8331
msgstr ""
8332
8333
#: dummy/help_topics/working-trees/detail.txt:8
8334
msgid ""
8335
"When you push a branch to a remote system, a working tree will not be\n"
8336
"created. If one is already present the files will not be updated. The\n"
8337
"branch information will be updated and the working tree will be marked\n"
8338
"as out-of-date. Updating a working tree remotely is difficult, as there\n"
8339
"may be uncommitted changes or the update may cause content conflicts that "
8340
"are\n"
8341
"difficult to deal with remotely."
8342
msgstr ""
8343
8344
#: dummy/help_topics/working-trees/detail.txt:15
8345
msgid ""
8346
"If you have a branch with no working tree you can use the 'checkout' "
8347
"command\n"
8348
"to create a working tree. If you run 'bzr checkout .' from the branch it "
8349
"will\n"
8350
"create the working tree. If the branch is updated remotely, you can update "
8351
"the\n"
8352
"working tree by running 'bzr update' in that directory."
8353
msgstr ""
8354
8355
#: dummy/help_topics/working-trees/detail.txt:20
8356
msgid ""
8357
"If you have a branch with a working tree that you do not want the 'remove-"
8358
"tree'\n"
8359
"command will remove the tree if it is safe. This can be done to avoid the\n"
8360
"warning about the remote working tree not being updated when pushing to the\n"
8361
"branch. It can also be useful when working with a '--no-trees' repository\n"
8362
"(see 'bzr help repositories')."
8363
msgstr ""
8364
8365
#: dummy/help_topics/working-trees/detail.txt:26
8366
msgid ""
8367
"If you want to have a working tree on a remote machine that you push to you\n"
8368
"can either run 'bzr update' in the remote branch after each push, or use "
8369
"some\n"
8370
"other method to update the tree during the push. There is an 'rspush' "
8371
"plugin\n"
8372
"that will update the working tree using rsync as well as doing a push. "
8373
"There\n"
8374
"is also a 'push-and-update' plugin that automates running 'bzr update' via "
8375
"SSH\n"
8376
"after each push."
8377
msgstr ""
8378
8379
#: dummy/help_topics/working-trees/detail.txt:33
8380
msgid "Useful commands::"
8381
msgstr ""
8382
8383
#: dummy/help_topics/working-trees/detail.txt:35
8384
msgid ""
8385
" checkout Create a working tree when a branch does not have one.\n"
8386
" remove-tree Removes the working tree from a branch when it is safe to do "
8387
"so.\n"
8388
" update When a working tree is out of sync with its associated "
8389
"branch\n"
8390
" this will update the tree to match the branch.\n"
8391
msgstr ""
8392
8393
#: dummy/help_topics/working-trees/summary.txt:1
8394
msgid "Information on working trees"
8395
msgstr ""
8396
8397
#: en/help_topics/authentication.txt:1
8398
msgid ""
8399
"Authentication Settings\n"
8400
"======================="
8401
msgstr ""
8402
8403
#: en/help_topics/authentication.txt:4
8404
msgid ""
8405
"\n"
8406
"Intent\n"
8407
"------"
8408
msgstr ""
8409
8410
#: en/help_topics/authentication.txt:8
8411
msgid ""
8412
"Many different authentication policies can be described in the\n"
8413
"``authentication.conf`` file but a particular user should need only a few\n"
8414
"definitions to cover his needs without having to specify a user and a "
8415
"password\n"
8416
"for every branch he uses."
8417
msgstr ""
8418
8419
#: en/help_topics/authentication.txt:13
8420
msgid ""
8421
"The definitions found in this file are used to find the credentials to use "
8422
"for\n"
8423
"a given url. The same credentials can generally be used for as many branches "
8424
"as\n"
8425
"possible by grouping their declaration around the remote servers that need\n"
8426
"them. It's even possible to declare credentials that will be used by "
8427
"different\n"
8428
"servers."
8429
msgstr ""
8430
8431
#: en/help_topics/authentication.txt:19
8432
msgid ""
8433
"The intent is to make this file as small as possible to minimize maintenance."
8434
msgstr ""
8435
8436
#: en/help_topics/authentication.txt:21
8437
msgid ""
8438
"Once the relevant credentials are declared in this file you may use branch "
8439
"urls\n"
8440
"without embedding passwords (security hazard) or even users (enabling "
8441
"sharing\n"
8442
"of your urls with others)."
8443
msgstr ""
8444
8445
#: en/help_topics/authentication.txt:25
8446
msgid "Instead of using::"
8447
msgstr ""
8448
8449
#: en/help_topics/authentication.txt:27
8450
msgid " bzr branch ftp://joe:secret@host.com/path/to/my/branch"
8451
msgstr ""
8452
8453
#: en/help_topics/authentication.txt:29
8454
msgid "you simply use::"
8455
msgstr ""
8456
8457
#: en/help_topics/authentication.txt:31
8458
msgid " bzr branch ftp://host.com/path/to/my/branch"
8459
msgstr ""
8460
8461
#: en/help_topics/authentication.txt:33
8462
msgid ""
8463
"provided you have created the following ``authentication.conf`` file::"
8464
msgstr ""
8465
8466
#: en/help_topics/authentication.txt:35
8467
msgid ""
8468
" [myprojects]\n"
8469
" scheme=ftp\n"
8470
" host=host.com\n"
8471
" user=joe\n"
8472
" password=secret\n"
8473
" "
8474
msgstr ""
8475
8476
#: en/help_topics/authentication.txt:42
8477
msgid ""
8478
"Authentication definitions\n"
8479
"--------------------------"
8480
msgstr ""
8481
8482
#: en/help_topics/authentication.txt:45
8483
msgid ""
8484
"There are two kinds of authentication used by the various schemes supported "
8485
"by\n"
8486
"bzr:"
8487
msgstr ""
8488
8489
#: en/help_topics/authentication.txt:48
8490
msgid "1. user and password"
8491
msgstr ""
8492
8493
#: en/help_topics/authentication.txt:50
8494
msgid ""
8495
"``FTP`` needs a (``user``, ``password``) to authenticate against a ``host``\n"
8496
"``SFTP`` can use either a password or a host key to authenticate. However,\n"
8497
"ssh agents are a better, more secure solution. So we have chosen to not "
8498
"provide\n"
8499
"our own less secure method."
8500
msgstr ""
8501
8502
#: en/help_topics/authentication.txt:55
8503
msgid "2. user, realm and password"
8504
msgstr ""
8505
8506
#: en/help_topics/authentication.txt:57
8507
msgid ""
8508
"``HTTP`` and ``HTTPS`` needs a (``user, realm, password``) to authenticate\n"
8509
"against a host. But, by using ``.htaccess`` files, for example, it is "
8510
"possible\n"
8511
"to define several (``user, realm, password``) for a given ``host``. So what "
8512
"is\n"
8513
"really needed is (``user``, ``password``, ``host``, ``path``). The ``realm`` "
8514
"is\n"
8515
"not taken into account in the definitions, but will displayed if bzr "
8516
"prompts\n"
8517
"you for a password."
8518
msgstr ""
8519
8520
#: en/help_topics/authentication.txt:64
8521
msgid ""
8522
"``HTTP proxy`` can be handled as ``HTTP`` (or ``HTTPS``) by explicitly\n"
8523
"specifying the appropriate port."
8524
msgstr ""
8525
8526
#: en/help_topics/authentication.txt:67
8527
msgid ""
8528
"To take all schemes into account, the password will be deduced from a set "
8529
"of\n"
8530
"authentication definitions (``scheme``, ``host``, ``port``, ``path``, "
8531
"``user``,\n"
8532
"``password``)."
8533
msgstr ""
8534
8535
#: en/help_topics/authentication.txt:71
8536
msgid ""
8537
" * ``scheme``: can be empty (meaning the rest of the definition can be "
8538
"used\n"
8539
" for any scheme), ``SFTP`` and ``bzr+ssh`` should not be used here, "
8540
"``ssh``\n"
8541
" should be used instead since this is the real scheme regarding\n"
8542
" authentication,"
8543
msgstr ""
8544
8545
#: en/help_topics/authentication.txt:76
8546
msgid " * ``host``: can be empty (to act as a default for any host),"
8547
msgstr ""
8548
8549
#: en/help_topics/authentication.txt:78
8550
msgid ""
8551
" * ``port`` can be empty (useful when an host provides several servers for "
8552
"the\n"
8553
" same scheme), only numerical values are allowed, this should be used "
8554
"only\n"
8555
" when the server uses a port different than the scheme standard port,"
8556
msgstr ""
8557
8558
#: en/help_topics/authentication.txt:82
8559
msgid " * ``path``: can be empty (FTP or SFTP will never user it),"
8560
msgstr ""
8561
8562
#: en/help_topics/authentication.txt:84
8563
msgid ""
8564
" * ``user``: can be empty (``bzr`` will defaults to python's\n"
8565
" ``getpass.get_user()``),"
8566
msgstr ""
8567
8568
#: en/help_topics/authentication.txt:87
8569
msgid ""
8570
" * ``password``: can be empty if you prefer to always be prompted for your\n"
8571
" password."
8572
msgstr ""
8573
8574
#: en/help_topics/authentication.txt:90
8575
msgid ""
8576
"Multiple definitions can be provided and, for a given URL, bzr will select "
8577
"a\n"
8578
"(``user`` [, ``password``]) based on the following rules :"
8579
msgstr ""
8580
8581
#: en/help_topics/authentication.txt:93
8582
msgid " 1. the first match wins,"
8583
msgstr ""
8584
8585
#: en/help_topics/authentication.txt:95
8586
msgid " 2. empty fields match everything,"
8587
msgstr ""
8588
8589
#: en/help_topics/authentication.txt:97
8590
msgid ""
8591
" 3. ``scheme`` matches even if decorators are used in the requested URL,"
8592
msgstr ""
8593
8594
#: en/help_topics/authentication.txt:99
8595
msgid ""
8596
" 4. ``host`` matches exactly or act as a domain if it starts with '.'\n"
8597
" (``project.bzr.sf.net`` will match ``.bzr.sf.net`` but "
8598
"``projectbzr.sf.net``\n"
8599
" will not match ``bzr.sf.net``)."
8600
msgstr ""
8601
8602
#: en/help_topics/authentication.txt:103
8603
msgid ""
8604
" 5. ``port`` matches if included in the requested URL (exact matches only)"
8605
msgstr ""
8606
8607
#: en/help_topics/authentication.txt:105
8608
msgid ""
8609
" 6. ``path`` matches if included in the requested URL (and by rule #2 "
8610
"above,\n"
8611
" empty paths will match any provided path)."
8612
msgstr ""
8613
8614
#: en/help_topics/authentication.txt:110
8615
msgid ""
8616
"File format\n"
8617
"-----------"
8618
msgstr ""
8619
8620
#: en/help_topics/authentication.txt:113
8621
msgid ""
8622
"The general rules for :doc:`configuration files <configuration-help>`\n"
8623
"apply except for the variable policies."
8624
msgstr ""
8625
8626
#: en/help_topics/authentication.txt:116
8627
msgid "Each section describes an authentication definition."
8628
msgstr ""
8629
8630
#: en/help_topics/authentication.txt:118
8631
msgid ""
8632
"The section name is an arbitrary string, only the ``DEFAULT`` value is "
8633
"reserved\n"
8634
"and should appear as the *last* section."
8635
msgstr ""
8636
8637
#: en/help_topics/authentication.txt:121
8638
msgid "Each section should define:"
8639
msgstr ""
8640
8641
#: en/help_topics/authentication.txt:123
8642
msgid "* ``user``: the login to be used,"
8643
msgstr ""
8644
8645
#: en/help_topics/authentication.txt:125
8646
msgid "Each section could define:"
8647
msgstr ""
8648
8649
#: en/help_topics/authentication.txt:127
8650
msgid "* ``host``: the remote server,"
8651
msgstr ""
8652
8653
#: en/help_topics/authentication.txt:129
8654
msgid "* ``port``: the port the server is listening,"
8655
msgstr ""
8656
8657
#: en/help_topics/authentication.txt:131
8658
msgid "* ``path``: the branch location,"
8659
msgstr ""
8660
8661
#: en/help_topics/authentication.txt:133
8662
msgid "* ``password``: the password."
8663
msgstr ""
8664
8665
#: en/help_topics/authentication.txt:135
8666
msgid ""
8667
"\n"
8668
"Examples\n"
8669
"--------"
8670
msgstr ""
8671
8672
#: en/help_topics/authentication.txt:139
8673
msgid ""
8674
"\n"
8675
"Personal projects hosted outside\n"
8676
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
8677
msgstr ""
8678
8679
#: en/help_topics/authentication.txt:143
8680
msgid ""
8681
"All connections are done with the same ``user`` (the remote one for which "
8682
"the\n"
8683
"default bzr one is not appropriate) and the password is always prompted "
8684
"with\n"
8685
"some exceptions::"
8686
msgstr ""
8687
8688
#: en/help_topics/authentication.txt:147
8689
msgid ""
8690
" # Pet projects on hobby.net\n"
8691
" [hobby]\n"
8692
" host=r.hobby.net\n"
8693
" user=jim\n"
8694
" password=obvious1234\n"
8695
" \n"
8696
" # Home server\n"
8697
" [home]\n"
8698
" scheme=https\n"
8699
" host=home.net\n"
8700
" user=joe\n"
8701
" password=1essobV10us\n"
8702
" \n"
8703
" [DEFAULT]\n"
8704
" # Our local user is barbaz, on all remote sites we're known as "
8705
"foobar\n"
8706
" user=foobar"
8707
msgstr ""
8708
8709
#: en/help_topics/authentication.txt:164
8710
msgid ""
8711
"\n"
8712
"Source hosting provider\n"
8713
"~~~~~~~~~~~~~~~~~~~~~~~"
8714
msgstr ""
8715
8716
#: en/help_topics/authentication.txt:168
8717
msgid "In the shp.net (fictitious) domain, each project has its own site::"
8718
msgstr ""
8719
8720
#: en/help_topics/authentication.txt:170
8721
msgid ""
8722
" [shpnet domain]\n"
8723
" # we use sftp, but ssh is the scheme used for authentication\n"
8724
" scheme=ssh\n"
8725
" # The leading '.' ensures that 'shp.net' alone doesn't match\n"
8726
" host=.shp.net\n"
8727
" user=joe\n"
8728
" # bzr don't support supplying a password for sftp,\n"
8729
" # consider using an ssh agent if you don't want to supply\n"
8730
" # a password interactively. (pageant, ssh-agent, etc)"
8731
msgstr ""
8732
8733
#: en/help_topics/authentication.txt:180
8734
msgid ""
8735
"HTTPS, SFTP servers and their proxy\n"
8736
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
8737
msgstr ""
8738
8739
#: en/help_topics/authentication.txt:183
8740
msgid ""
8741
"At company.com, the server hosting release and integration branches is "
8742
"behind a\n"
8743
"proxy, and the two branches use different authentication policies::"
8744
msgstr ""
8745
8746
#: en/help_topics/authentication.txt:186
8747
msgid ""
8748
" [reference code]\n"
8749
" scheme=https\n"
8750
" host=dev.company.com\n"
8751
" path=/dev\n"
8752
" user=user1\n"
8753
" password=pass1"
8754
msgstr ""
8755
8756
#: en/help_topics/authentication.txt:193
8757
msgid ""
8758
" # development branches on dev server\n"
8759
" [dev]\n"
8760
" scheme=ssh # bzr+ssh and sftp are available here\n"
8761
" host=dev.company.com\n"
8762
" path=/dev/integration\n"
8763
" user=user2\n"
8764
" \n"
8765
" # proxy\n"
8766
" [proxy]\n"
8767
" scheme=http\n"
8768
" host=proxy.company.com\n"
8769
" port=3128\n"
8770
" user=proxyuser1\n"
8771
" password=proxypass1"
8772
msgstr ""
8773
8774
#: en/help_topics/authentication.txt:208
8775
msgid ""
8776
"\n"
8777
"Planned enhancements\n"
8778
"--------------------"
8779
msgstr ""
8780
8781
#: en/help_topics/authentication.txt:212
8782
msgid ""
8783
"The following are not yet implemented but planned as parts of a work in\n"
8784
"progress:"
8785
msgstr ""
8786
8787
#: en/help_topics/authentication.txt:215
8788
msgid "* add a ``password_encoding`` field allowing:"
8789
msgstr ""
8790
8791
#: en/help_topics/authentication.txt:217
8792
msgid ""
8793
" - storing the passwords in various obfuscating encodings (base64 for one),"
8794
msgstr ""
8795
8796
#: en/help_topics/authentication.txt:219
8797
msgid " - delegate password storage to plugins (.netrc for example)."
8798
msgstr ""
8799
8800
#: en/help_topics/authentication.txt:221
8801
msgid ""
8802
"* update the credentials when the user is prompted for user or password,"
8803
msgstr ""
8804
8805
#: en/help_topics/authentication.txt:223
8806
msgid "* add a ``verify_certificates`` field for ``HTTPS``."
8807
msgstr ""
8808
8809
#: en/help_topics/authentication.txt:225
8810
msgid ""
8811
"The ``password_encoding`` and ``verify_certificates`` fields are recognized "
8812
"but\n"
8813
"ignored in the actual implementation.\n"
8814
msgstr ""
8815
8816
#: en/help_topics/bugs.txt:1
8817
msgid "Bug Tracker Settings"
8818
msgstr ""
8819
8820
#: en/help_topics/bugs.txt:3
8821
msgid ""
8822
"When making a commit, metadata about bugs fixed by that change can be\n"
8823
"recorded by using the ``--fixes`` option. For each bug marked as fixed, an\n"
8824
"entry is included in the 'bugs' revision property stating '<url> <status>'.\n"
8825
"(The only ``status`` value currently supported is ``fixed.``)"
8826
msgstr ""
8827
8828
#: en/help_topics/bugs.txt:8
8829
msgid ""
8830
"The ``--fixes`` option allows you to specify a bug tracker and a bug "
8831
"identifier\n"
8832
"rather than a full URL. This looks like::"
8833
msgstr ""
8834
8835
#: en/help_topics/bugs.txt:11
8836
msgid " bzr commit --fixes <tracker>:<id>"
8837
msgstr ""
8838
8839
#: en/help_topics/bugs.txt:13 en/help_topics/configuration.txt:398
8840
msgid "or::"
8841
msgstr ""
8842
8843
#: en/help_topics/bugs.txt:15
8844
msgid " bzr commit --fixes <id>"
8845
msgstr ""
8846
8847
#: en/help_topics/bugs.txt:17
8848
msgid ""
8849
"where \"<tracker>\" is an identifier for the bug tracker, and \"<id>\" is "
8850
"the\n"
8851
"identifier for that bug within the bugtracker, usually the bug number.\n"
8852
"If \"<tracker>\" is not specified the ``bugtracker`` set in the branch\n"
8853
"or global configuration is used."
8854
msgstr ""
8855
8856
#: en/help_topics/bugs.txt:22
8857
msgid ""
8858
"Bazaar knows about a few bug trackers that have many users. If\n"
8859
"you use one of these bug trackers then there is no setup required to\n"
8860
"use this feature, you just need to know the tracker identifier to use.\n"
8861
"These are the bugtrackers that are built in:"
8862
msgstr ""
8863
8864
#: en/help_topics/bugs.txt:27
8865
msgid ""
8866
" ============================ ============ ============\n"
8867
" URL Abbreviation Example\n"
8868
" ============================ ============ ============\n"
8869
" https://bugs.launchpad.net/ lp lp:12345\n"
8870
" http://bugs.debian.org/ deb deb:12345\n"
8871
" http://bugzilla.gnome.org/ gnome gnome:12345\n"
8872
" ============================ ============ ============"
8873
msgstr ""
8874
8875
#: en/help_topics/bugs.txt:35
8876
msgid ""
8877
"For the bug trackers not listed above configuration is required.\n"
8878
"Support for generating the URLs for any project using Bugzilla or Trac\n"
8879
"is built in, along with a template mechanism for other bugtrackers with\n"
8880
"simple URL schemes. If your bug tracker can't be described by one\n"
8881
"of the schemes described below then you can write a plugin to support\n"
8882
"it."
8883
msgstr ""
8884
8885
#: en/help_topics/bugs.txt:42
8886
msgid ""
8887
"If you use Bugzilla or Trac, then you only need to set a configuration\n"
8888
"variable which contains the base URL of the bug tracker. These options\n"
8889
"can go into ``bazaar.conf``, ``branch.conf`` or into a branch-specific\n"
8890
"configuration section in ``locations.conf``. You can set up these values\n"
8891
"for each of the projects you work on."
8892
msgstr ""
8893
8894
#: en/help_topics/bugs.txt:48
8895
msgid ""
8896
"Note: As you provide a short name for each tracker, you can specify one or\n"
8897
"more bugs in one or more trackers at commit time if you wish."
8898
msgstr ""
8899
8900
#: en/help_topics/bugs.txt:51
8901
msgid ""
8902
"Launchpad\n"
8903
"---------"
8904
msgstr ""
8905
8906
#: en/help_topics/bugs.txt:54
8907
msgid ""
8908
"Use ``bzr commit --fixes lp:2`` to record that this commit fixes bug 2."
8909
msgstr ""
8910
8911
#: en/help_topics/bugs.txt:56
8912
msgid ""
8913
"bugzilla_<tracker>_url\n"
8914
"----------------------"
8915
msgstr ""
8916
8917
#: en/help_topics/bugs.txt:59
8918
msgid ""
8919
"If present, the location of the Bugzilla bug tracker referred to by\n"
8920
"<tracker>. This option can then be used together with ``bzr commit\n"
8921
"--fixes`` to mark bugs in that tracker as being fixed by that commit. For\n"
8922
"example::"
8923
msgstr ""
8924
8925
#: en/help_topics/bugs.txt:64
8926
msgid " bugzilla_squid_url = http://bugs.squid-cache.org"
8927
msgstr ""
8928
8929
#: en/help_topics/bugs.txt:66
8930
msgid ""
8931
"would allow ``bzr commit --fixes squid:1234`` to mark Squid's bug 1234 as\n"
8932
"fixed."
8933
msgstr ""
8934
8935
#: en/help_topics/bugs.txt:69
8936
msgid ""
8937
"trac_<tracker>_url\n"
8938
"------------------"
8939
msgstr ""
8940
8941
#: en/help_topics/bugs.txt:72
8942
msgid ""
8943
"If present, the location of the Trac instance referred to by\n"
8944
"<tracker>. This option can then be used together with ``bzr commit\n"
8945
"--fixes`` to mark bugs in that tracker as being fixed by that commit. For\n"
8946
"example::"
8947
msgstr ""
8948
8949
#: en/help_topics/bugs.txt:77
8950
msgid " trac_twisted_url = http://www.twistedmatrix.com/trac"
8951
msgstr ""
8952
8953
#: en/help_topics/bugs.txt:79
8954
msgid ""
8955
"would allow ``bzr commit --fixes twisted:1234`` to mark Twisted's bug 1234 "
8956
"as\n"
8957
"fixed."
8958
msgstr ""
8959
8960
#: en/help_topics/bugs.txt:82
8961
msgid ""
8962
"bugtracker_<tracker>_url\n"
8963
"------------------------"
8964
msgstr ""
8965
8966
#: en/help_topics/bugs.txt:85
8967
msgid ""
8968
"If present, the location of a generic bug tracker instance referred to by\n"
8969
"<tracker>. The location must contain an ``{id}`` placeholder,\n"
8970
"which will be replaced by a specific bug ID. This option can then be used\n"
8971
"together with ``bzr commit --fixes`` to mark bugs in that tracker as being\n"
8972
"fixed by that commit. For example::"
8973
msgstr ""
8974
8975
#: en/help_topics/bugs.txt:91
8976
msgid " bugtracker_python_url = http://bugs.python.org/issue{id}"
8977
msgstr ""
8978
8979
#: en/help_topics/bugs.txt:93
8980
msgid ""
8981
"would allow ``bzr commit --fixes python:1234`` to mark bug 1234 in Python's\n"
8982
"Roundup bug tracker as fixed, or::"
8983
msgstr ""
8984
8985
#: en/help_topics/bugs.txt:96
8986
msgid ""
8987
" bugtracker_cpan_url = http://rt.cpan.org/Public/Bug/Display.html?id={id}"
8988
msgstr ""
8989
8990
#: en/help_topics/bugs.txt:98
8991
msgid ""
8992
"would allow ``bzr commit --fixes cpan:1234`` to mark bug 1234 in CPAN's\n"
8993
"RT bug tracker as fixed, or::"
8994
msgstr ""
8995
8996
#: en/help_topics/bugs.txt:101
8997
msgid " bugtracker_hudson_url = http://issues.hudson-ci.org/browse/{id}"
8998
msgstr ""
8999
9000
#: en/help_topics/bugs.txt:103
9001
msgid ""
9002
"would allow ``bzr commit --fixes hudson:HUDSON-1234`` to mark bug HUDSON-"
9003
"1234\n"
9004
"in Hudson's JIRA bug tracker as fixed.\n"
9005
msgstr ""
9006
9007
#: en/help_topics/commands.txt:1
9008
msgid ""
9009
"add Add specified files or directories.\n"
9010
"alias Set/unset and display aliases.\n"
9011
"annotate Show the origin of each line in a file.\n"
9012
"bash-completion Generate a shell function for bash command line "
9013
"completion.\n"
9014
" [bash_completion]\n"
9015
"bind Convert the current branch into a checkout of the "
9016
"supplied\n"
9017
" branch.\n"
9018
"branch Create a new branch that is a copy of an existing branch.\n"
9019
"branches List the branches available at the current location.\n"
9020
"break-lock Break a dead lock.\n"
9021
"cat Write the contents of a file as of a given revision to\n"
9022
" standard output.\n"
9023
"check Validate working tree structure, branch consistency and\n"
9024
" repository history.\n"
9025
"checkout Create a new checkout of an existing branch.\n"
9026
"clean-tree Remove unwanted files from working tree.\n"
9027
"commit Commit changes into a new revision.\n"
9028
"config Display, set or remove a configuration option.\n"
9029
"conflicts List files with conflicts.\n"
9030
"deleted List files deleted in the working tree.\n"
9031
"diff Show differences in the working tree, between revisions "
9032
"or\n"
9033
" branches.\n"
9034
"dpush Push into a different VCS without any custom bzr "
9035
"metadata.\n"
9036
"export Export current or past revision to a destination directory "
9037
"or\n"
9038
" archive.\n"
9039
"help Show help on a command or other topic.\n"
9040
"ignore Ignore specified files or patterns.\n"
9041
"ignored List ignored files and the patterns that matched them.\n"
9042
"info Show information about a working tree, branch or "
9043
"repository.\n"
9044
"init Make a directory into a versioned branch.\n"
9045
"init-repository Create a shared repository for branches to share storage\n"
9046
" space.\n"
9047
"join Combine a tree into its containing tree.\n"
9048
"launchpad-login Show or set the Launchpad user ID. [launchpad]\n"
9049
"launchpad-mirror Ask Launchpad to mirror a branch now. [launchpad]\n"
9050
"launchpad-open Open a Launchpad branch page in your web browser. "
9051
"[launchpad]\n"
9052
"log Show historical log for a branch or subset of a branch.\n"
9053
"lp-find-proposal Find the proposal to merge this revision. [launchpad]\n"
9054
"lp-propose-merge Propose merging a branch on Launchpad. [launchpad]\n"
9055
"ls List files in a tree.\n"
9056
"merge Perform a three-way merge.\n"
9057
"missing Show unmerged/unpulled revisions between two branches.\n"
9058
"mkdir Create a new versioned directory.\n"
9059
"mv Move or rename a file.\n"
9060
"nick Print or set the branch nickname.\n"
9061
"pack Compress the data within a repository.\n"
9062
"plugins List the installed plugins.\n"
9063
"pull Turn this branch into a mirror of another branch.\n"
9064
"push Update a mirror of this branch.\n"
9065
"reconcile Reconcile bzr metadata in a branch.\n"
9066
"reconfigure Reconfigure the type of a bzr directory.\n"
9067
"register-branch Register a branch with launchpad.net. [launchpad]\n"
9068
"remerge Redo a merge.\n"
9069
"remove Remove files or directories.\n"
9070
"remove-branch Remove a branch.\n"
9071
"remove-tree Remove the working tree from a given branch/checkout.\n"
9072
"renames Show list of renamed files.\n"
9073
"resolve Mark a conflict as resolved.\n"
9074
"revert Revert files to a previous revision.\n"
9075
"revno Show current revision number.\n"
9076
"root Show the tree root directory.\n"
9077
"send Mail or create a merge-directive for submitting changes.\n"
9078
"serve Run the bzr server.\n"
9079
"shelve Temporarily set aside some changes from the current tree.\n"
9080
"sign-my-commits Sign all commits by a given committer.\n"
9081
"split Split a subdirectory of a tree into a separate tree.\n"
9082
"status Display status summary.\n"
9083
"switch Set the branch of a checkout and update.\n"
9084
"tag Create, remove or modify a tag naming a revision.\n"
9085
"tags List tags.\n"
9086
"testament Show testament (signing-form) of a revision.\n"
9087
"unbind Convert the current checkout into a regular branch.\n"
9088
"uncommit Remove the last committed revision.\n"
9089
"unshelve Restore shelved changes.\n"
9090
"update Update a working tree to a new revision.\n"
9091
"upgrade Upgrade a repository, branch or working tree to a newer\n"
9092
" format.\n"
9093
"verify-signatures Verify all commit signatures.\n"
9094
"version Show version of bzr.\n"
9095
"version-info Show version information about this tree.\n"
9096
"view Manage filtered views.\n"
9097
"whoami Show or set bzr user id.\n"
9098
msgstr ""
9099
9100
#: en/help_topics/configuration.txt:1
9101
msgid ""
9102
"Configuration Settings\n"
9103
"======================="
9104
msgstr ""
9105
9106
#: en/help_topics/configuration.txt:4
9107
msgid ""
9108
"Environment settings\n"
9109
"---------------------"
9110
msgstr ""
9111
9112
#: en/help_topics/configuration.txt:7
9113
msgid ""
9114
"While most configuration is handled by configuration files, some options\n"
9115
"which may be semi-permanent can also be controlled through the environment."
9116
msgstr ""
9117
9118
#: en/help_topics/configuration.txt:10
9119
msgid ""
9120
"BZR_EMAIL\n"
9121
"~~~~~~~~~"
9122
msgstr ""
9123
9124
#: en/help_topics/configuration.txt:13
9125
msgid "Override the email id used by Bazaar. Typical format::"
9126
msgstr ""
9127
9128
#: en/help_topics/configuration.txt:15
9129
msgid " \"John Doe <jdoe@example.com>\""
9130
msgstr ""
9131
9132
#: en/help_topics/configuration.txt:17
9133
msgid "See also the ``email`` configuration option."
9134
msgstr ""
9135
9136
#: en/help_topics/configuration.txt:19
9137
msgid ""
9138
"BZR_PROGRESS_BAR\n"
9139
"~~~~~~~~~~~~~~~~"
9140
msgstr ""
9141
9142
#: en/help_topics/configuration.txt:22
9143
msgid ""
9144
"Override the progress display. Possible values are \"none\" or \"text\". "
9145
"If\n"
9146
"the value is \"none\" then no progress bar is displayed. The value \"text\" "
9147
"draws\n"
9148
"the ordinary command line progress bar."
9149
msgstr ""
9150
9151
#: en/help_topics/configuration.txt:26
9152
msgid ""
9153
"BZR_SIGQUIT_PDB\n"
9154
"~~~~~~~~~~~~~~~"
9155
msgstr ""
9156
9157
#: en/help_topics/configuration.txt:29
9158
msgid ""
9159
"Control whether SIGQUIT behaves normally or invokes a breakin debugger."
9160
msgstr ""
9161
9162
#: en/help_topics/configuration.txt:31
9163
msgid ""
9164
"* 0 = Standard SIGQUIT behavior (normally, exit with a core dump)\n"
9165
"* 1 = Invoke breakin debugger (default)"
9166
msgstr ""
9167
9168
#: en/help_topics/configuration.txt:34
9169
msgid ""
9170
"BZR_HOME\n"
9171
"~~~~~~~~"
9172
msgstr ""
9173
9174
#: en/help_topics/configuration.txt:37
9175
msgid "Override the home directory used by Bazaar."
9176
msgstr ""
9177
9178
#: en/help_topics/configuration.txt:39
9179
msgid ""
9180
"BZR_SSH\n"
9181
"~~~~~~~"
9182
msgstr ""
9183
9184
#: en/help_topics/configuration.txt:42
9185
msgid "Select a different SSH implementation."
9186
msgstr ""
9187
9188
#: en/help_topics/configuration.txt:44
9189
msgid ""
9190
"BZR_PDB\n"
9191
"~~~~~~~"
9192
msgstr ""
9193
9194
#: en/help_topics/configuration.txt:47
9195
msgid "Control whether to launch a debugger on error."
9196
msgstr ""
9197
9198
#: en/help_topics/configuration.txt:49
9199
msgid ""
9200
"* 0 = Standard behavior\n"
9201
"* 1 = Launch debugger"
9202
msgstr ""
9203
9204
#: en/help_topics/configuration.txt:52
9205
msgid ""
9206
"BZR_REMOTE_PATH\n"
9207
"~~~~~~~~~~~~~~~"
9208
msgstr ""
9209
9210
#: en/help_topics/configuration.txt:55
9211
msgid "Path to the Bazaar executable to use when using the bzr+ssh protocol."
9212
msgstr ""
9213
9214
#: en/help_topics/configuration.txt:57
9215
msgid "See also the ``bzr_remote_path`` configuration option."
9216
msgstr ""
9217
9218
#: en/help_topics/configuration.txt:59
9219
msgid ""
9220
"BZR_EDITOR\n"
9221
"~~~~~~~~~~"
9222
msgstr ""
9223
9224
#: en/help_topics/configuration.txt:62
9225
msgid "Path to the editor Bazaar should use for commit messages, etc."
9226
msgstr ""
9227
9228
#: en/help_topics/configuration.txt:64
9229
msgid ""
9230
"BZR_LOG\n"
9231
"~~~~~~~"
9232
msgstr ""
9233
9234
#: en/help_topics/configuration.txt:67
9235
msgid ""
9236
"Location of the Bazaar log file. You can check the current location by\n"
9237
"running ``bzr version``."
9238
msgstr ""
9239
9240
#: en/help_topics/configuration.txt:70
9241
msgid ""
9242
"The log file contains debug information that is useful for diagnosing or\n"
9243
"reporting problems with Bazaar."
9244
msgstr ""
9245
9246
#: en/help_topics/configuration.txt:73
9247
msgid ""
9248
"Setting this to ``NUL`` on Windows or ``/dev/null`` on other platforms\n"
9249
"will disable logging."
9250
msgstr ""
9251
9252
#: en/help_topics/configuration.txt:76
9253
msgid ""
9254
"\n"
9255
"BZR_PLUGIN_PATH\n"
9256
"~~~~~~~~~~~~~~~"
9257
msgstr ""
9258
9259
#: en/help_topics/configuration.txt:80
9260
msgid ""
9261
"The path to the plugins directory that Bazaar should use.\n"
9262
"If not set, Bazaar will search for plugins in:"
9263
msgstr ""
9264
9265
#: en/help_topics/configuration.txt:83
9266
msgid ""
9267
"* the user specific plugin directory (containing the ``user`` plugins),"
9268
msgstr ""
9269
9270
#: en/help_topics/configuration.txt:85
9271
msgid "* the bzrlib directory (containing the ``core`` plugins),"
9272
msgstr ""
9273
9274
#: en/help_topics/configuration.txt:87
9275
msgid ""
9276
"* the site specific plugin directory if applicable (containing\n"
9277
" the ``site`` plugins)."
9278
msgstr ""
9279
9280
#: en/help_topics/configuration.txt:90
9281
msgid ""
9282
"If ``BZR_PLUGIN_PATH`` is set in any fashion, it will change the\n"
9283
"the way the plugin are searched. "
9284
msgstr ""
9285
9286
#: en/help_topics/configuration.txt:93
9287
msgid ""
9288
"As for the ``PATH`` variables, if multiple directories are\n"
9289
"specified in ``BZR_PLUGIN_PATH`` they should be separated by the\n"
9290
"platform specific appropriate character (':' on Unix,\n"
9291
"';' on windows)"
9292
msgstr ""
9293
9294
#: en/help_topics/configuration.txt:98
9295
msgid ""
9296
"By default if ``BZR_PLUGIN_PATH`` is set, it replaces searching\n"
9297
"in ``user``. However it will continue to search in ``core`` and\n"
9298
"``site`` unless they are explicitly removed."
9299
msgstr ""
9300
9301
#: en/help_topics/configuration.txt:102
9302
msgid ""
9303
"If you need to change the order or remove one of these\n"
9304
"directories, you should use special values:"
9305
msgstr ""
9306
9307
#: en/help_topics/configuration.txt:105
9308
msgid ""
9309
"* ``-user``, ``-core``, ``-site`` will remove the corresponding\n"
9310
" path from the default values,"
9311
msgstr ""
9312
9313
#: en/help_topics/configuration.txt:108
9314
msgid ""
9315
"* ``+user``, ``+core``, ``+site`` will add the corresponding path\n"
9316
" before the remaining default values (and also remove it from\n"
9317
" the default values)."
9318
msgstr ""
9319
9320
#: en/help_topics/configuration.txt:112
9321
msgid ""
9322
"Note that the special values 'user', 'core' and 'site' should be\n"
9323
"used literally, they will be substituted by the corresponding,\n"
9324
"platform specific, values."
9325
msgstr ""
9326
9327
#: en/help_topics/configuration.txt:116
9328
msgid ""
9329
"The examples below use ':' as the separator, windows users\n"
9330
"should use ';'."
9331
msgstr ""
9332
9333
#: en/help_topics/configuration.txt:119
9334
msgid "Overriding the default user plugin directory::"
9335
msgstr ""
9336
9337
#: en/help_topics/configuration.txt:121
9338
msgid " BZR_PLUGIN_PATH='/path/to/my/other/plugins'"
9339
msgstr ""
9340
9341
#: en/help_topics/configuration.txt:123
9342
msgid "Disabling the site directory while retaining the user directory::"
9343
msgstr ""
9344
9345
#: en/help_topics/configuration.txt:125
9346
msgid " BZR_PLUGIN_PATH='-site:+user'"
9347
msgstr ""
9348
9349
#: en/help_topics/configuration.txt:127
9350
msgid "Disabling all plugins (better achieved with --no-plugins)::"
9351
msgstr ""
9352
9353
#: en/help_topics/configuration.txt:129
9354
msgid " BZR_PLUGIN_PATH='-user:-core:-site'"
9355
msgstr ""
9356
9357
#: en/help_topics/configuration.txt:131
9358
msgid "Overriding the default site plugin directory::"
9359
msgstr ""
9360
9361
#: en/help_topics/configuration.txt:133
9362
msgid " BZR_PLUGIN_PATH='/path/to/my/site/plugins:-site':+user"
9363
msgstr ""
9364
9365
#: en/help_topics/configuration.txt:135
9366
msgid ""
9367
"BZR_DISABLE_PLUGINS\n"
9368
"~~~~~~~~~~~~~~~~~~~"
9369
msgstr ""
9370
9371
#: en/help_topics/configuration.txt:138
9372
msgid ""
9373
"Under special circumstances (mostly when trying to diagnose a\n"
9374
"bug), it's better to disable a plugin (or several) rather than\n"
9375
"uninstalling them completely. Such plugins can be specified in\n"
9376
"the ``BZR_DISABLE_PLUGINS`` environment variable."
9377
msgstr ""
9378
9379
#: en/help_topics/configuration.txt:143
9380
msgid ""
9381
"In that case, ``bzr`` will stop loading the specified plugins and\n"
9382
"will raise an import error if they are explicitly imported (by\n"
9383
"another plugin that depends on them for example)."
9384
msgstr ""
9385
9386
#: en/help_topics/configuration.txt:147
9387
msgid "Disabling ``myplugin`` and ``yourplugin`` is achieved by::"
9388
msgstr ""
9389
9390
#: en/help_topics/configuration.txt:149
9391
msgid " BZR_DISABLE_PLUGINS='myplugin:yourplugin'"
9392
msgstr ""
9393
9394
#: en/help_topics/configuration.txt:151
9395
msgid ""
9396
"BZR_PLUGINS_AT\n"
9397
"~~~~~~~~~~~~~~"
9398
msgstr ""
9399
9400
#: en/help_topics/configuration.txt:154
9401
msgid ""
9402
"When adding a new feature or working on a bug in a plugin,\n"
9403
"developers often need to use a specific version of a given\n"
9404
"plugin. Since python requires that the directory containing the\n"
9405
"code is named like the plugin itself this make it impossible to\n"
9406
"use arbitrary directory names (using a two-level directory scheme\n"
9407
"is inconvenient). ``BZR_PLUGINS_AT`` allows such directories even\n"
9408
"if they don't appear in ``BZR_PLUGIN_PATH`` ."
9409
msgstr ""
9410
9411
#: en/help_topics/configuration.txt:162
9412
msgid ""
9413
"Plugins specified in this environment variable takes precedence\n"
9414
"over the ones in ``BZR_PLUGIN_PATH``."
9415
msgstr ""
9416
9417
#: en/help_topics/configuration.txt:165
9418
msgid ""
9419
"The variable specified a list of ``plugin_name@plugin path``,\n"
9420
"``plugin_name`` being the name of the plugin as it appears in\n"
9421
"python module paths, ``plugin_path`` being the path to the\n"
9422
"directory containing the plugin code itself\n"
9423
"(i.e. ``plugins/myplugin`` not ``plugins``). Use ':' as the list\n"
9424
"separator, use ';' on windows."
9425
msgstr ""
9426
9427
#: en/help_topics/configuration.txt:172
9428
msgid ""
9429
"Example:\n"
9430
"~~~~~~~~"
9431
msgstr ""
9432
9433
#: en/help_topics/configuration.txt:175
9434
msgid ""
9435
"Using a specific version of ``myplugin``:\n"
9436
"``BZR_PLUGINS_AT='myplugin@/home/me/bugfixes/123456-myplugin``"
9437
msgstr ""
9438
9439
#: en/help_topics/configuration.txt:178
9440
msgid ""
9441
"BZRPATH\n"
9442
"~~~~~~~"
9443
msgstr ""
9444
9445
#: en/help_topics/configuration.txt:181
9446
msgid "The path where Bazaar should look for shell plugin external commands."
9447
msgstr ""
9448
9449
#: en/help_topics/configuration.txt:183
9450
msgid ""
9451
"\n"
9452
"http_proxy, https_proxy\n"
9453
"~~~~~~~~~~~~~~~~~~~~~~~"
9454
msgstr ""
9455
9456
#: en/help_topics/configuration.txt:187
9457
msgid "Specifies the network proxy for outgoing connections, for example::"
9458
msgstr ""
9459
9460
#: en/help_topics/configuration.txt:189
9461
msgid ""
9462
" http_proxy=http://proxy.example.com:3128/ \n"
9463
" https_proxy=http://proxy.example.com:3128/"
9464
msgstr ""
9465
9466
#: en/help_topics/configuration.txt:192
9467
msgid ""
9468
"\n"
9469
"Configuration files\n"
9470
"-------------------"
9471
msgstr ""
9472
9473
#: en/help_topics/configuration.txt:196
9474
msgid ""
9475
"Location\n"
9476
"~~~~~~~~"
9477
msgstr ""
9478
9479
#: en/help_topics/configuration.txt:199
9480
msgid ""
9481
"Configuration files are located in ``$HOME/.bazaar`` on Unix and\n"
9482
"``C:\\Documents and Settings\\<username>\\Application Data\\Bazaar\\2.0`` "
9483
"on\n"
9484
"Windows. (You can check the location for your system by using\n"
9485
"``bzr version``.)"
9486
msgstr ""
9487
9488
#: en/help_topics/configuration.txt:204
9489
msgid "There are three primary configuration files in this location:"
9490
msgstr ""
9491
9492
#: en/help_topics/configuration.txt:206
9493
msgid "* ``bazaar.conf`` describes default configuration options,"
9494
msgstr ""
9495
9496
#: en/help_topics/configuration.txt:208
9497
msgid ""
9498
"* ``locations.conf`` describes configuration information for\n"
9499
" specific branch locations,"
9500
msgstr ""
9501
9502
#: en/help_topics/configuration.txt:211
9503
msgid ""
9504
"* ``authentication.conf`` describes credential information for\n"
9505
" remote servers."
9506
msgstr ""
9507
9508
#: en/help_topics/configuration.txt:214
9509
msgid ""
9510
"Each branch can also contain a configuration file that sets values specific\n"
9511
"to that branch. This file is found at ``.bzr/branch/branch.conf`` within "
9512
"the\n"
9513
"branch. This file is visible to all users of a branch, if you wish to "
9514
"override\n"
9515
"one of the values for a branch with a setting that is specific to you then "
9516
"you\n"
9517
"can do so in ``locations.conf``."
9518
msgstr ""
9519
9520
#: en/help_topics/configuration.txt:220
9521
msgid ""
9522
"General format\n"
9523
"~~~~~~~~~~~~~~"
9524
msgstr ""
9525
9526
#: en/help_topics/configuration.txt:223
9527
msgid ""
9528
"An ini file has three types of contructs: section headers, section\n"
9529
"options and comments."
9530
msgstr ""
9531
9532
#: en/help_topics/configuration.txt:226
9533
msgid ""
9534
"Comments\n"
9535
"^^^^^^^^"
9536
msgstr ""
9537
9538
#: en/help_topics/configuration.txt:229
9539
msgid ""
9540
"A comment is any line that starts with a \"#\" (sometimes called a \"hash\n"
9541
"mark\", \"pound sign\" or \"number sign\"). Comment lines are ignored by\n"
9542
"Bazaar when parsing ini files."
9543
msgstr ""
9544
9545
#: en/help_topics/configuration.txt:233
9546
msgid ""
9547
"Section headers\n"
9548
"^^^^^^^^^^^^^^^"
9549
msgstr ""
9550
9551
#: en/help_topics/configuration.txt:236
9552
msgid ""
9553
"A section header is a word enclosed in brackets that starts at the begining\n"
9554
"of a line. A typical section header looks like this::"
9555
msgstr ""
9556
9557
#: en/help_topics/configuration.txt:239
9558
msgid " [DEFAULT]"
9559
msgstr ""
9560
9561
#: en/help_topics/configuration.txt:241
9562
msgid ""
9563
"The only valid section headers for bazaar.conf currently are [DEFAULT] and\n"
9564
"[ALIASES]. Section headers are case sensitive. The default section provides "
9565
"for\n"
9566
"setting options which can be overridden with the branch config file."
9567
msgstr ""
9568
9569
#: en/help_topics/configuration.txt:245
9570
msgid ""
9571
"For ``locations.conf``, the options from the section with the\n"
9572
"longest matching section header are used to the exclusion of other\n"
9573
"potentially valid section headers. A section header uses the path for\n"
9574
"the branch as the section header. Some examples include::"
9575
msgstr ""
9576
9577
#: en/help_topics/configuration.txt:250
9578
msgid ""
9579
" [http://mybranches.isp.com/~jdoe/branchdir]\n"
9580
" [/home/jdoe/branches/]"
9581
msgstr ""
9582
9583
#: en/help_topics/configuration.txt:253
9584
msgid ""
9585
"\n"
9586
"Section options\n"
9587
"^^^^^^^^^^^^^^^"
9588
msgstr ""
9589
9590
#: en/help_topics/configuration.txt:257
9591
msgid ""
9592
"A section option resides within a section. A section option contains an\n"
9593
"option name, an equals sign and a value. For example::"
9594
msgstr ""
9595
9596
#: en/help_topics/configuration.txt:260
9597
msgid ""
9598
" email = John Doe <jdoe@isp.com>\n"
9599
" gpg_signing_key = Amy Pond <amy@example.com>"
9600
msgstr ""
9601
9602
#: en/help_topics/configuration.txt:263
9603
msgid ""
9604
"A option can reference other options by enclosing them in curly brackets::"
9605
msgstr ""
9606
9607
#: en/help_topics/configuration.txt:265
9608
msgid ""
9609
" my_branch_name = feature_x\n"
9610
" my_server = bzr+ssh://example.com\n"
9611
" push_location = {my_server}/project/{my_branch_name}"
9612
msgstr ""
9613
9614
#: en/help_topics/configuration.txt:269
9615
msgid ""
9616
"Option policies\n"
9617
"^^^^^^^^^^^^^^^"
9618
msgstr ""
9619
9620
#: en/help_topics/configuration.txt:272
9621
msgid ""
9622
"Options defined in a section affect the named directory or URL plus\n"
9623
"any locations they contain. Policies can be used to change how an\n"
9624
"option value is interpreted for contained locations. Currently\n"
9625
"there are three policies available:"
9626
msgstr ""
9627
9628
#: en/help_topics/configuration.txt:277
9629
msgid ""
9630
" none:\n"
9631
" the value is interpreted the same for contained locations. This is\n"
9632
" the default behaviour.\n"
9633
" norecurse:\n"
9634
" the value is only used for the exact location specified by the\n"
9635
" section name.\n"
9636
" appendpath:\n"
9637
" for contained locations, any additional path components are\n"
9638
" appended to the value."
9639
msgstr ""
9640
9641
#: en/help_topics/configuration.txt:287
9642
msgid ""
9643
"Policies are specified by keys with names of the form "
9644
"\"<option_name>:policy\".\n"
9645
"For example, to define the push location for a tree of branches, the\n"
9646
"following could be used::"
9647
msgstr ""
9648
9649
#: en/help_topics/configuration.txt:291
9650
msgid ""
9651
" [/top/location]\n"
9652
" push_location = sftp://example.com/location\n"
9653
" push_location:policy = appendpath"
9654
msgstr ""
9655
9656
#: en/help_topics/configuration.txt:295
9657
msgid ""
9658
"With this configuration, the push location for ``/top/location/branch1``\n"
9659
"would be ``sftp://example.com/location/branch1``."
9660
msgstr ""
9661
9662
#: en/help_topics/configuration.txt:298
9663
msgid ""
9664
"Section local options\n"
9665
"^^^^^^^^^^^^^^^^^^^^^"
9666
msgstr ""
9667
9668
#: en/help_topics/configuration.txt:301
9669
msgid ""
9670
"Some options are defined automatically inside a given section and can be\n"
9671
"refered to in this section only. "
9672
msgstr ""
9673
9674
#: en/help_topics/configuration.txt:304
9675
msgid "For example, the ``appendpath`` policy can be used like this::"
9676
msgstr ""
9677
9678
#: en/help_topics/configuration.txt:306
9679
msgid ""
9680
" [/home/vila/src/bzr/bugs]\n"
9681
" mypush = lp:~vila/bzr\n"
9682
" mypush:policy=appendpath"
9683
msgstr ""
9684
9685
#: en/help_topics/configuration.txt:310
9686
msgid "Using ``relpath`` to achieve the same result is done like this::"
9687
msgstr ""
9688
9689
#: en/help_topics/configuration.txt:312
9690
msgid ""
9691
" [/home/vila/src/bzr/bugs]\n"
9692
" mypush = lp:~vila/bzr/{relpath}"
9693
msgstr ""
9694
9695
#: en/help_topics/configuration.txt:315
9696
msgid ""
9697
"In both cases, when used in a directory like\n"
9698
"``/home/vila/src/bzr/bugs/832013-expand-in-stack`` we'll get::"
9699
msgstr ""
9700
9701
#: en/help_topics/configuration.txt:318 en/help_topics/configuration.txt:329
9702
msgid ""
9703
" $ bzr config mypush\n"
9704
" lp:~vila/bzr/832013-expand-in-stack"
9705
msgstr ""
9706
9707
#: en/help_topics/configuration.txt:321
9708
msgid "Another such option is ``basename`` which can be used like this::"
9709
msgstr ""
9710
9711
#: en/help_topics/configuration.txt:323
9712
msgid ""
9713
" [/home/vila/src/bzr]\n"
9714
" mypush = lp:~vila/bzr/{basename}"
9715
msgstr ""
9716
9717
#: en/help_topics/configuration.txt:326
9718
msgid ""
9719
"When used in a directory like\n"
9720
"``/home/vila/src/bzr/bugs/832013-expand-in-stack`` we'll get::"
9721
msgstr ""
9722
9723
#: en/help_topics/configuration.txt:332
9724
msgid ""
9725
"Note that ``basename`` here refers to the base name of ``relpath`` which\n"
9726
"itself is defined as the relative path between the section name and the\n"
9727
"location it matches."
9728
msgstr ""
9729
9730
#: en/help_topics/configuration.txt:336
9731
msgid ""
9732
"When an option is local to a Section, it cannot be referred to from option\n"
9733
"values in any other section from the same ``Store`` nor from any other\n"
9734
"``Store``."
9735
msgstr ""
9736
9737
#: en/help_topics/configuration.txt:340
9738
msgid ""
9739
"\n"
9740
"The main configuration file, bazaar.conf\n"
9741
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
9742
msgstr ""
9743
9744
#: en/help_topics/configuration.txt:344
9745
msgid ""
9746
"``bazaar.conf`` allows two sections: ``[DEFAULT]`` and ``[ALIASES]``.\n"
9747
"The default section contains the default\n"
9748
"configuration options for all branches. The default section can be\n"
9749
"overriden by providing a branch-specific section in ``locations.conf``."
9750
msgstr ""
9751
9752
#: en/help_topics/configuration.txt:349
9753
msgid "A typical ``bazaar.conf`` section often looks like the following::"
9754
msgstr ""
9755
9756
#: en/help_topics/configuration.txt:351
9757
msgid ""
9758
" [DEFAULT]\n"
9759
" email = John Doe <jdoe@isp.com>\n"
9760
" editor = /usr/bin/vim\n"
9761
" create_signatures = when-required"
9762
msgstr ""
9763
9764
#: en/help_topics/configuration.txt:356
9765
msgid ""
9766
"\n"
9767
"The branch location configuration file, locations.conf\n"
9768
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
9769
msgstr ""
9770
9771
#: en/help_topics/configuration.txt:360
9772
msgid ""
9773
"``locations.conf`` allows one to specify overriding settings for\n"
9774
"a specific branch. The format is almost identical to the default section in\n"
9775
"bazaar.conf with one significant change: The section header, instead of "
9776
"saying\n"
9777
"default, will be the path to a branch that you wish to override a value\n"
9778
"for. The '?' and '*' wildcards are supported::"
9779
msgstr ""
9780
9781
#: en/help_topics/configuration.txt:366
9782
msgid ""
9783
" [/home/jdoe/branches/nethack]\n"
9784
" email = Nethack Admin <nethack@nethack.com>"
9785
msgstr ""
9786
9787
#: en/help_topics/configuration.txt:369
9788
msgid ""
9789
" [http://hypothetical.site.com/branches/devel-branch]\n"
9790
" create_signatures = always"
9791
msgstr ""
9792
9793
#: en/help_topics/configuration.txt:372
9794
msgid ""
9795
"The authentication configuration file, authentication.conf\n"
9796
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
9797
msgstr ""
9798
9799
#: en/help_topics/configuration.txt:375
9800
msgid ""
9801
"``authentication.conf`` allows one to specify credentials for\n"
9802
"remote servers. This can be used for all the supported transports and any "
9803
"part\n"
9804
"of bzr that requires authentication (smtp for example)."
9805
msgstr ""
9806
9807
#: en/help_topics/configuration.txt:379
9808
msgid ""
9809
"The syntax of the file obeys the same rules as the others except for the\n"
9810
"option policies which don't apply."
9811
msgstr ""
9812
9813
#: en/help_topics/configuration.txt:382
9814
msgid ""
9815
"For more information on the possible uses of the authentication "
9816
"configuration\n"
9817
"file see :doc:`authentication-help`."
9818
msgstr ""
9819
9820
#: en/help_topics/configuration.txt:385
9821
msgid ""
9822
"\n"
9823
"Common options\n"
9824
"--------------"
9825
msgstr ""
9826
9827
#: en/help_topics/configuration.txt:389
9828
msgid ""
9829
"debug_flags\n"
9830
"~~~~~~~~~~~"
9831
msgstr ""
9832
9833
#: en/help_topics/configuration.txt:392
9834
msgid ""
9835
"A comma-separated list of debugging options to turn on. The same values\n"
9836
"can be used as with the -D command-line option (see `help global-options`).\n"
9837
"For example::"
9838
msgstr ""
9839
9840
#: en/help_topics/configuration.txt:396
9841
msgid " debug_flags = hpss"
9842
msgstr ""
9843
9844
#: en/help_topics/configuration.txt:400
9845
msgid " debug_flags = hpss,evil"
9846
msgstr ""
9847
9848
#: en/help_topics/configuration.txt:402
9849
msgid ""
9850
"email\n"
9851
"~~~~~"
9852
msgstr ""
9853
9854
#: en/help_topics/configuration.txt:405
9855
msgid ""
9856
"The email address to use when committing a branch. Typically takes the form\n"
9857
"of::"
9858
msgstr ""
9859
9860
#: en/help_topics/configuration.txt:408
9861
msgid " email = Full Name <account@hostname.tld>"
9862
msgstr ""
9863
9864
#: en/help_topics/configuration.txt:410
9865
msgid ""
9866
"editor\n"
9867
"~~~~~~"
9868
msgstr ""
9869
9870
#: en/help_topics/configuration.txt:413
9871
msgid ""
9872
"The path of the editor that you wish to use if *bzr commit* is run without\n"
9873
"a commit message. This setting is trumped by the environment variable\n"
9874
"``BZR_EDITOR``, and overrides the ``VISUAL`` and ``EDITOR`` environment\n"
9875
"variables."
9876
msgstr ""
9877
9878
#: en/help_topics/configuration.txt:418
9879
msgid ""
9880
"log_format\n"
9881
"~~~~~~~~~~"
9882
msgstr ""
9883
9884
#: en/help_topics/configuration.txt:421
9885
msgid ""
9886
"The default log format to use. Standard log formats are ``long``, ``short``\n"
9887
"and ``line``. Additional formats may be provided by plugins. The default\n"
9888
"value is ``long``."
9889
msgstr ""
9890
9891
#: en/help_topics/configuration.txt:425
9892
msgid ""
9893
"check_signatures\n"
9894
"~~~~~~~~~~~~~~~~"
9895
msgstr ""
9896
9897
#: en/help_topics/configuration.txt:428
9898
msgid ""
9899
"Reserved for future use. These options will allow a policy for branches to\n"
9900
"require signatures."
9901
msgstr ""
9902
9903
#: en/help_topics/configuration.txt:431
9904
msgid ""
9905
"require\n"
9906
" The gnupg signature for revisions must be present and must be valid."
9907
msgstr ""
9908
9909
#: en/help_topics/configuration.txt:434
9910
msgid ""
9911
"ignore\n"
9912
" Do not check gnupg signatures of revisions."
9913
msgstr ""
9914
9915
#: en/help_topics/configuration.txt:437
9916
msgid ""
9917
"check-available\n"
9918
" (default) If gnupg signatures for revisions are present, check them.\n"
9919
" Bazaar will fail if it finds a bad signature, but will not fail if\n"
9920
" no signature is present."
9921
msgstr ""
9922
9923
#: en/help_topics/configuration.txt:442
9924
msgid ""
9925
"create_signatures\n"
9926
"~~~~~~~~~~~~~~~~~"
9927
msgstr ""
9928
9929
#: en/help_topics/configuration.txt:445
9930
msgid ""
9931
"Defines the behaviour of signing revisions on commits. By default bzr will "
9932
"not\n"
9933
"sign new commits."
9934
msgstr ""
9935
9936
#: en/help_topics/configuration.txt:448
9937
msgid ""
9938
"always\n"
9939
" Sign every new revision that is committed. If the signing fails then "
9940
"the\n"
9941
" commit will not be made."
9942
msgstr ""
9943
9944
#: en/help_topics/configuration.txt:452
9945
msgid ""
9946
"when-required\n"
9947
" Reserved for future use."
9948
msgstr ""
9949
9950
#: en/help_topics/configuration.txt:455
9951
msgid ""
9952
"never\n"
9953
" Reserved for future use."
9954
msgstr ""
9955
9956
#: en/help_topics/configuration.txt:458
9957
msgid ""
9958
"In future it is planned that ``when-required`` will sign newly\n"
9959
"committed revisions only when the branch requires them. ``never`` will "
9960
"refuse\n"
9961
"to sign newly committed revisions, even if the branch requires signatures."
9962
msgstr ""
9963
9964
#: en/help_topics/configuration.txt:462
9965
msgid ""
9966
"dirstate.fdatasync\n"
9967
"~~~~~~~~~~~~~~~~~~"
9968
msgstr ""
9969
9970
#: en/help_topics/configuration.txt:465
9971
msgid ""
9972
"If true (default), working tree metadata changes are flushed through the\n"
9973
"OS buffers to physical disk. This is somewhat slower, but means data\n"
9974
"should not be lost if the machine crashes. See also repository.fdatasync."
9975
msgstr ""
9976
9977
#: en/help_topics/configuration.txt:469
9978
msgid ""
9979
"gpg_signing_key\n"
9980
"~~~~~~~~~~~~~~~"
9981
msgstr ""
9982
9983
#: en/help_topics/configuration.txt:472
9984
msgid ""
9985
"The GnuPG user identity to use when signing commits. Can be an e-mail\n"
9986
"address, key fingerprint or full key ID. When unset or when set to\n"
9987
"\"default\" Bazaar will use the user e-mail set with ``whoami``."
9988
msgstr ""
9989
9990
#: en/help_topics/configuration.txt:476
9991
msgid ""
9992
"recurse\n"
9993
"~~~~~~~"
9994
msgstr ""
9995
9996
#: en/help_topics/configuration.txt:479
9997
msgid ""
9998
"Only useful in ``locations.conf``. Defines whether or not the\n"
9999
"configuration for this section applies to subdirectories:"
10000
msgstr ""
10001
10002
#: en/help_topics/configuration.txt:482
10003
msgid ""
10004
"true\n"
10005
" (default) This section applies to subdirectories as well."
10006
msgstr ""
10007
10008
#: en/help_topics/configuration.txt:485
10009
msgid ""
10010
"false\n"
10011
" This section only applies to the branch at this directory and not\n"
10012
" branches below it."
10013
msgstr ""
10014
10015
#: en/help_topics/configuration.txt:489
10016
msgid ""
10017
"gpg_signing_command\n"
10018
"~~~~~~~~~~~~~~~~~~~"
10019
msgstr ""
10020
10021
#: en/help_topics/configuration.txt:492
10022
msgid ""
10023
"(Default: \"gpg\"). Which program should be used to sign and check "
10024
"revisions.\n"
10025
"For example::"
10026
msgstr ""
10027
10028
#: en/help_topics/configuration.txt:495
10029
msgid " gpg_signing_command = /usr/bin/gnpg"
10030
msgstr ""
10031
10032
#: en/help_topics/configuration.txt:497
10033
msgid ""
10034
"The specified command must accept the options \"--clearsign\" and \"-u "
10035
"<email>\"."
10036
msgstr ""
10037
10038
#: en/help_topics/configuration.txt:499
10039
msgid ""
10040
"bzr_remote_path\n"
10041
"~~~~~~~~~~~~~~~"
10042
msgstr ""
10043
10044
#: en/help_topics/configuration.txt:502
10045
msgid ""
10046
"(Default: \"bzr\"). The path to the command that should be used to run the "
10047
"smart\n"
10048
"server for bzr. This value may only be specified in locations.conf, because:"
10049
msgstr ""
10050
10051
#: en/help_topics/configuration.txt:505
10052
msgid ""
10053
"- it's needed before branch.conf is accessible\n"
10054
"- allowing remote branch.conf files to specify commands would be a security\n"
10055
" risk"
10056
msgstr ""
10057
10058
#: en/help_topics/configuration.txt:509
10059
msgid "It is overridden by the BZR_REMOTE_PATH environment variable."
10060
msgstr ""
10061
10062
#: en/help_topics/configuration.txt:511
10063
msgid ""
10064
"smtp_server\n"
10065
"~~~~~~~~~~~"
10066
msgstr ""
10067
10068
#: en/help_topics/configuration.txt:514
10069
msgid ""
10070
"(Default: \"localhost\"). SMTP server to use when Bazaar needs to send\n"
10071
"email, eg. with ``merge-directive --mail-to``, or the bzr-email plugin."
10072
msgstr ""
10073
10074
#: en/help_topics/configuration.txt:517
10075
msgid ""
10076
"smtp_username, smtp_password\n"
10077
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
10078
msgstr ""
10079
10080
#: en/help_topics/configuration.txt:520
10081
msgid ""
10082
"User and password to authenticate to the SMTP server. If smtp_username\n"
10083
"is set, and smtp_password is not, Bazaar will prompt for a password.\n"
10084
"These settings are only needed if the SMTP server requires authentication\n"
10085
"to send mail."
10086
msgstr ""
10087
10088
#: en/help_topics/configuration.txt:525
10089
msgid ""
10090
"locks.steal_dead\n"
10091
"~~~~~~~~~~~~~~~~"
10092
msgstr ""
10093
10094
#: en/help_topics/configuration.txt:528
10095
msgid ""
10096
"If set to true, bzr will automatically break locks held by processes from\n"
10097
"the same machine and user that are no longer alive. Otherwise, it will\n"
10098
"print a message and you can break the lock manually, if you are satisfied\n"
10099
"the object is no longer in use."
10100
msgstr ""
10101
10102
#: en/help_topics/configuration.txt:533
10103
msgid ""
10104
"mail_client\n"
10105
"~~~~~~~~~~~"
10106
msgstr ""
10107
10108
#: en/help_topics/configuration.txt:536
10109
msgid ""
10110
"A mail client to use for sending merge requests.\n"
10111
"By default, bzr will try to use ``mapi`` on Windows. On other platforms, "
10112
"it\n"
10113
"will try ``xdg-email``. If either of these fails, it will fall back to\n"
10114
"``editor``."
10115
msgstr ""
10116
10117
#: en/help_topics/configuration.txt:541
10118
msgid "Supported values for specific clients:"
10119
msgstr ""
10120
10121
#: en/help_topics/configuration.txt:543
10122
msgid ""
10123
":claws: Use Claws. This skips a dialog for attaching files.\n"
10124
":evolution: Use Evolution.\n"
10125
":kmail: Use KMail.\n"
10126
":mutt: Use Mutt.\n"
10127
":thunderbird: Use Mozilla Thunderbird or Icedove. For Thunderbird/Icedove "
10128
"1.5,\n"
10129
" this works around some bugs that xdg-email doesn't handle."
10130
msgstr ""
10131
10132
#: en/help_topics/configuration.txt:550
10133
msgid "Supported generic values are:"
10134
msgstr ""
10135
10136
#: en/help_topics/configuration.txt:552
10137
msgid ""
10138
":default: See above.\n"
10139
":editor: Use your editor to compose the merge request. This also uses\n"
10140
" your commit id, (see ``bzr whoami``), smtp_server and (optionally)\n"
10141
" smtp_username and smtp_password.\n"
10142
":mapi: Use your preferred e-mail client on Windows.\n"
10143
":xdg-email: Use xdg-email to run your preferred mail program"
10144
msgstr ""
10145
10146
#: en/help_topics/configuration.txt:559
10147
msgid ""
10148
"repository.fdatasync\n"
10149
"~~~~~~~~~~~~~~~~~~~~"
10150
msgstr ""
10151
10152
#: en/help_topics/configuration.txt:562
10153
msgid ""
10154
"If true (default), repository changes are flushed through the OS buffers\n"
10155
"to physical disk. This is somewhat slower, but means data should not be\n"
10156
"lost if the machine crashes. See also dirstate.fdatasync."
10157
msgstr ""
10158
10159
#: en/help_topics/configuration.txt:566
10160
msgid ""
10161
"submit_branch\n"
10162
"~~~~~~~~~~~~~"
10163
msgstr ""
10164
10165
#: en/help_topics/configuration.txt:569
10166
msgid ""
10167
"The branch you intend to submit your current work to. This is "
10168
"automatically\n"
10169
"set by ``bzr send``, and is also used by the ``submit:`` revision spec. "
10170
"This\n"
10171
"should usually be set on a per-branch or per-location basis."
10172
msgstr ""
10173
10174
#: en/help_topics/configuration.txt:573
10175
msgid ""
10176
"public_branch\n"
10177
"~~~~~~~~~~~~~"
10178
msgstr ""
10179
10180
#: en/help_topics/configuration.txt:576
10181
msgid ""
10182
"A publically-accessible version of this branch (implying that this version "
10183
"is\n"
10184
"not publically-accessible). Used (and set) by ``bzr send``."
10185
msgstr ""
10186
10187
#: en/help_topics/configuration.txt:579
10188
msgid ""
10189
"suppress_warnings\n"
10190
"~~~~~~~~~~~~~~~~~"
10191
msgstr ""
10192
10193
#: en/help_topics/configuration.txt:582
10194
msgid ""
10195
"A list of strings, each string represent a warning that can be emitted by\n"
10196
"bzr. Mentioning a warning in this list tells bzr to not emit it."
10197
msgstr ""
10198
10199
#: en/help_topics/configuration.txt:585
10200
msgid "Valid values:"
10201
msgstr ""
10202
10203
#: en/help_topics/configuration.txt:587
10204
msgid ""
10205
"* ``format_deprecation``:\n"
10206
" whether the format deprecation warning is shown on repositories that "
10207
"are\n"
10208
" using deprecated formats."
10209
msgstr ""
10210
10211
#: en/help_topics/configuration.txt:591
10212
msgid ""
10213
"default_format\n"
10214
"~~~~~~~~~~~~~~"
10215
msgstr ""
10216
10217
#: en/help_topics/configuration.txt:594
10218
msgid ""
10219
"A format name for the default format used when creating branches. See "
10220
"``bzr\n"
10221
"help formats`` for possible values."
10222
msgstr ""
10223
10224
#: en/help_topics/configuration.txt:597
10225
msgid ""
10226
"\n"
10227
"Unicode options\n"
10228
"---------------"
10229
msgstr ""
10230
10231
#: en/help_topics/configuration.txt:601
10232
msgid ""
10233
"output_encoding\n"
10234
"~~~~~~~~~~~~~~~"
10235
msgstr ""
10236
10237
#: en/help_topics/configuration.txt:604
10238
msgid ""
10239
"A Python unicode encoding name for text output from bzr, such as log\n"
10240
"information. Values include: utf8, cp850, ascii, iso-8859-1. The default\n"
10241
"is the terminal encoding prefered by the operating system."
10242
msgstr ""
10243
10244
#: en/help_topics/configuration.txt:608
10245
msgid ""
10246
"\n"
10247
"Branch type specific options\n"
10248
"----------------------------"
10249
msgstr ""
10250
10251
#: en/help_topics/configuration.txt:612
10252
msgid ""
10253
"These options apply only to branches that use the ``dirstate-tags`` or\n"
10254
"later format. They\n"
10255
"are usually set in ``.bzr/branch/branch.conf`` automatically, but may be\n"
10256
"manually set in ``locations.conf`` or ``bazaar.conf``."
10257
msgstr ""
10258
10259
#: en/help_topics/configuration.txt:617
10260
msgid ""
10261
"append_revisions_only\n"
10262
"~~~~~~~~~~~~~~~~~~~~~"
10263
msgstr ""
10264
10265
#: en/help_topics/configuration.txt:620
10266
msgid ""
10267
"If set to \"True\" then revisions can only be appended to the log, not\n"
10268
"removed. A branch with this setting enabled can only pull from another\n"
10269
"branch if the other branch's log is a longer version of its own. This is\n"
10270
"normally set by ``bzr init --append-revisions-only``. If you set it\n"
10271
"manually, use either 'True' or 'False' (case-sensitive) to maintain\n"
10272
"compatibility with previous bzr versions (older than 2.2)."
10273
msgstr ""
10274
10275
#: en/help_topics/configuration.txt:627
10276
msgid ""
10277
"parent_location\n"
10278
"~~~~~~~~~~~~~~~"
10279
msgstr ""
10280
10281
#: en/help_topics/configuration.txt:630
10282
msgid ""
10283
"If present, the location of the default branch for pull or merge. This "
10284
"option\n"
10285
"is normally set when creating a branch, the first ``pull`` or by ``pull\n"
10286
"--remember``."
10287
msgstr ""
10288
10289
#: en/help_topics/configuration.txt:634
10290
msgid ""
10291
"push_location\n"
10292
"~~~~~~~~~~~~~"
10293
msgstr ""
10294
10295
#: en/help_topics/configuration.txt:637
10296
msgid ""
10297
"If present, the location of the default branch for push. This option\n"
10298
"is normally set by the first ``push`` or ``push --remember``."
10299
msgstr ""
10300
10301
#: en/help_topics/configuration.txt:640
10302
msgid ""
10303
"push_strict\n"
10304
"~~~~~~~~~~~"
10305
msgstr ""
10306
10307
#: en/help_topics/configuration.txt:643
10308
msgid ""
10309
"If present, defines the ``--strict`` option default value for checking\n"
10310
"uncommitted changes before pushing."
10311
msgstr ""
10312
10313
#: en/help_topics/configuration.txt:646
10314
msgid ""
10315
"dpush_strict\n"
10316
"~~~~~~~~~~~~"
10317
msgstr ""
10318
10319
#: en/help_topics/configuration.txt:649
10320
msgid ""
10321
"If present, defines the ``--strict`` option default value for checking\n"
10322
"uncommitted changes before pushing into a different VCS without any\n"
10323
"custom bzr metadata."
10324
msgstr ""
10325
10326
#: en/help_topics/configuration.txt:653
10327
msgid ""
10328
"bound_location\n"
10329
"~~~~~~~~~~~~~~"
10330
msgstr ""
10331
10332
#: en/help_topics/configuration.txt:656
10333
msgid ""
10334
"The location that commits should go to when acting as a checkout.\n"
10335
"This option is normally set by ``bind``."
10336
msgstr ""
10337
10338
#: en/help_topics/configuration.txt:659
10339
msgid ""
10340
"bound\n"
10341
"~~~~~"
10342
msgstr ""
10343
10344
#: en/help_topics/configuration.txt:662
10345
msgid ""
10346
"If set to \"True\", the branch should act as a checkout, and push each "
10347
"commit to\n"
10348
"the bound_location. This option is normally set by ``bind``/``unbind``."
10349
msgstr ""
10350
10351
#: en/help_topics/configuration.txt:665
10352
msgid ""
10353
"send_strict\n"
10354
"~~~~~~~~~~~"
10355
msgstr ""
10356
10357
#: en/help_topics/configuration.txt:668
10358
msgid ""
10359
"If present, defines the ``--strict`` option default value for checking\n"
10360
"uncommitted changes before sending a merge directive."
10361
msgstr ""
10362
10363
#: en/help_topics/configuration.txt:671
10364
msgid ""
10365
"add.maximum_file_size\n"
10366
"~~~~~~~~~~~~~~~~~~~~~"
10367
msgstr ""
10368
10369
#: en/help_topics/configuration.txt:674
10370
msgid ""
10371
"Defines the maximum file size the command line \"add\" operation will allow\n"
10372
"in recursive mode, with files larger than this value being skipped. You may "
10373
"\n"
10374
"specify this value as an integer (in which case it is interpreted as bytes), "
10375
"\n"
10376
"or you may specify the value using SI units, i.e. 10KB, 20MB, 1G. A value of "
10377
"0 \n"
10378
"will disable skipping."
10379
msgstr ""
10380
10381
#: en/help_topics/configuration.txt:680
10382
msgid ""
10383
"External Merge Tools\n"
10384
"--------------------"
10385
msgstr ""
10386
10387
#: en/help_topics/configuration.txt:683
10388
msgid ""
10389
"bzr.mergetool.<name>\n"
10390
"~~~~~~~~~~~~~~~~~~~~"
10391
msgstr ""
10392
10393
#: en/help_topics/configuration.txt:686
10394
msgid ""
10395
"Defines an external merge tool called <name> with the given command-line.\n"
10396
"Arguments containing spaces should be quoted using single or double quotes. "
10397
"The\n"
10398
"executable may omit its path if it can be found on the PATH."
10399
msgstr ""
10400
10401
#: en/help_topics/configuration.txt:690
10402
msgid ""
10403
"The following markers can be used in the command-line to substitute "
10404
"filenames\n"
10405
"involved in the merge conflict::"
10406
msgstr ""
10407
10408
#: en/help_topics/configuration.txt:693
10409
msgid ""
10410
" {base} file.BASE\n"
10411
" {this} file.THIS\n"
10412
" {other} file.OTHER\n"
10413
" {result} output file\n"
10414
" {this_temp} temp copy of file.THIS, used to overwrite output file if "
10415
"merge\n"
10416
" succeeds."
10417
msgstr ""
10418
10419
#: en/help_topics/configuration.txt:702
10420
msgid " bzr.mergetool.kdiff3 = kdiff3 {base} {this} {other} -o {result}"
10421
msgstr ""
10422
10423
#: en/help_topics/configuration.txt:704
10424
msgid ""
10425
"bzr.default_mergetool\n"
10426
"~~~~~~~~~~~~~~~~~~~~~"
10427
msgstr ""
10428
10429
#: en/help_topics/configuration.txt:707
10430
msgid ""
10431
"Specifies which external merge tool (as defined above) should be selected "
10432
"by\n"
10433
"default in tools such as ``bzr qconflicts``."
10434
msgstr ""
10435
10436
#: en/help_topics/configuration.txt:712
10437
msgid " bzr.default_mergetool = kdiff3\n"
10438
msgstr ""
10439
10440
#: en/help_topics/conflict-types.txt:1
10441
msgid ""
10442
"Conflict Types\n"
10443
"=============="
10444
msgstr ""
10445
10446
#: en/help_topics/conflict-types.txt:4
10447
msgid ""
10448
"Some operations, like merge, revert and pull, modify the contents of your\n"
10449
"working tree. These modifications are programmatically generated, and so "
10450
"they\n"
10451
"may conflict with the current state of your working tree. "
10452
msgstr ""
10453
10454
#: en/help_topics/conflict-types.txt:8
10455
msgid ""
10456
"When conflicts are present in your working tree (as shown by ``bzr\n"
10457
"conflicts``), you should resolve them and then inform bzr that the "
10458
"conflicts\n"
10459
"have been resolved."
10460
msgstr ""
10461
10462
#: en/help_topics/conflict-types.txt:12
10463
msgid ""
10464
"Resolving conflicts is sometimes not obvious. Either because the user that\n"
10465
"should resolve them is not the one responsible for their occurrence, as is "
10466
"the\n"
10467
"case when merging other people's work or because some conflicts are "
10468
"presented\n"
10469
"in a way that is not easy to understand."
10470
msgstr ""
10471
10472
#: en/help_topics/conflict-types.txt:17
10473
msgid ""
10474
"Bazaar tries to avoid conflicts ; its aim is to ask you to resolve the\n"
10475
"conflict if and only if there's an actual conceptual conflict in the source\n"
10476
"tree. Because Bazaar doesn't understand the real meaning of the files "
10477
"being\n"
10478
"versioned, it can, when faced with ambiguities, fall short in either "
10479
"direction\n"
10480
"trying to resolve the conflict itself. Many kinds of changes can be "
10481
"combined\n"
10482
"programmatically, but sometimes only a human can determine the right thing "
10483
"to\n"
10484
"do."
10485
msgstr ""
10486
10487
#: en/help_topics/conflict-types.txt:25
10488
msgid ""
10489
"When Bazaar generates a conflict, it adds information into the working tree "
10490
"to\n"
10491
"present the conflicting versions, and it's up to you to find the correct\n"
10492
"resolution."
10493
msgstr ""
10494
10495
#: en/help_topics/conflict-types.txt:29
10496
msgid "Whatever the conflict is, resolving it is roughly done in two steps:"
10497
msgstr ""
10498
10499
#: en/help_topics/conflict-types.txt:31
10500
msgid ""
10501
"1. Modify the working tree content so that the conflicted item is now in "
10502
"the\n"
10503
" state you want to keep, then"
10504
msgstr ""
10505
10506
#: en/help_topics/conflict-types.txt:34
10507
msgid ""
10508
"2. Inform Bazaar that the conflict is now solved and ask to cleanup any\n"
10509
" remaining generated information (``bzr resolve <item>``)."
10510
msgstr ""
10511
10512
#: en/help_topics/conflict-types.txt:37
10513
msgid ""
10514
"For most conflict types, there are some obvious ways to modify the working\n"
10515
"tree and put it into the desired state. For some types of conflicts, Bazaar\n"
10516
"itself already made a choice, when possible."
10517
msgstr ""
10518
10519
#: en/help_topics/conflict-types.txt:41
10520
msgid ""
10521
"Yet, whether Bazaar makes a choice or not, there are some other simple but\n"
10522
"different ways to resolve the conflict."
10523
msgstr ""
10524
10525
#: en/help_topics/conflict-types.txt:44
10526
msgid ""
10527
"Each type of conflict is explained below, and the action which must be done "
10528
"to\n"
10529
"resolve the conflict is outlined."
10530
msgstr ""
10531
10532
#: en/help_topics/conflict-types.txt:47
10533
msgid ""
10534
"Various actions are available depending on the kind of conflict, for some "
10535
"of\n"
10536
"these actions, Bazaar can provide some help. In the end you should at least\n"
10537
"inform Bazaar that you're done with the conflict with::"
10538
msgstr ""
10539
10540
#: en/help_topics/conflict-types.txt:51
10541
msgid " ``bzr resolve FILE --action=done'"
10542
msgstr ""
10543
10544
#: en/help_topics/conflict-types.txt:53
10545
msgid ""
10546
"Note that this is the default action when a single file is involved so you "
10547
"can\n"
10548
"simply use::"
10549
msgstr ""
10550
10551
#: en/help_topics/conflict-types.txt:56
10552
msgid " ``bzr resolve FILE``"
10553
msgstr ""
10554
10555
#: en/help_topics/conflict-types.txt:58
10556
msgid "See ``bzr help resolve`` for more details."
10557
msgstr ""
10558
10559
#: en/help_topics/conflict-types.txt:60
10560
msgid ""
10561
"Text conflicts\n"
10562
"--------------"
10563
msgstr ""
10564
10565
#: en/help_topics/conflict-types.txt:63 en/help_topics/conflict-types.txt:120
10566
#: en/help_topics/conflict-types.txt:151 en/help_topics/conflict-types.txt:175
10567
#: en/help_topics/conflict-types.txt:198 en/help_topics/conflict-types.txt:213
10568
#: en/help_topics/conflict-types.txt:239 en/help_topics/conflict-types.txt:281
10569
#: en/help_topics/conflict-types.txt:303 en/help_topics/conflict-types.txt:339
10570
msgid "Typical message::"
10571
msgstr ""
10572
10573
#: en/help_topics/conflict-types.txt:65
10574
msgid " Text conflict in FILE"
10575
msgstr ""
10576
10577
#: en/help_topics/conflict-types.txt:67
10578
msgid ""
10579
"These are produced when a text merge cannot completely reconcile two sets "
10580
"of\n"
10581
"text changes. Bazaar will emit files for each version with the extensions\n"
10582
"THIS, OTHER, and BASE. THIS is the version of the file from the target "
10583
"tree,\n"
10584
"i.e. the tree that you are merging changes into. OTHER is the version that "
10585
"you\n"
10586
"are merging into the target. BASE is an older version that is used as a "
10587
"basis\n"
10588
"for comparison."
10589
msgstr ""
10590
10591
#: en/help_topics/conflict-types.txt:74
10592
msgid ""
10593
"In the main copy of the file, Bazaar will include all the changes that it\n"
10594
"could reconcile, and any un-reconciled conflicts are surrounded by\n"
10595
"\"herringbone\" markers like ``<<<<<<<``."
10596
msgstr ""
10597
10598
#: en/help_topics/conflict-types.txt:78
10599
msgid ""
10600
"Say the initial text is \"The project leader released it.\", and THIS "
10601
"modifies it\n"
10602
"to \"Martin Pool released it.\", while OTHER modifies it to \"The project "
10603
"leader\n"
10604
"released Bazaar.\" A conflict would look like this::"
10605
msgstr ""
10606
10607
#: en/help_topics/conflict-types.txt:82
10608
msgid ""
10609
" <<<<<<< TREE\n"
10610
" Martin Pool released it.\n"
10611
" =======\n"
10612
" The project leader released Bazaar.\n"
10613
" >>>>>>> MERGE-SOURCE"
10614
msgstr ""
10615
10616
#: en/help_topics/conflict-types.txt:88
10617
msgid "The correct resolution would be \"Martin Pool released Bazaar.\""
10618
msgstr ""
10619
10620
#: en/help_topics/conflict-types.txt:90
10621
msgid ""
10622
"You can handle text conflicts either by editing the main copy of the file,\n"
10623
"or by invoking external tools on the THIS, OTHER and BASE versions. It's\n"
10624
"worth mentioning that resolving text conflicts rarely involves picking one\n"
10625
"set of changes over the other (but see below when you encounter these\n"
10626
"cases). More often, the two sets of changes must be intelligently combined."
10627
msgstr ""
10628
10629
#: en/help_topics/conflict-types.txt:96
10630
msgid ""
10631
"If you edit the main copy, be sure to remove the herringbone markers. When\n"
10632
"you are done editing, the file should look like it never had a conflict, and "
10633
"be\n"
10634
"ready to commit."
10635
msgstr ""
10636
10637
#: en/help_topics/conflict-types.txt:100
10638
msgid ""
10639
"When you have resolved text conflicts, just run ``bzr resolve --auto``, and\n"
10640
"Bazaar will auto-detect which conflicts you have resolved."
10641
msgstr ""
10642
10643
#: en/help_topics/conflict-types.txt:103
10644
msgid ""
10645
"When the conflict is resolved, Bazaar deletes the previously generated\n"
10646
"``.BASE``, ``.THIS`` and ``.OTHER`` files if they are still present in the\n"
10647
"working tree."
10648
msgstr ""
10649
10650
#: en/help_topics/conflict-types.txt:107
10651
msgid ""
10652
"\n"
10653
"When you want to pick one set of changes over the other, you can use ``bzr\n"
10654
"resolve`` with one of the following actions:"
10655
msgstr ""
10656
10657
#: en/help_topics/conflict-types.txt:111
10658
msgid ""
10659
"* ``--action=take-this`` will issue ``mv FILE.THIS FILE``,\n"
10660
"* ``--action=take-other`` will issue ``mv FILE.OTHER FILE``."
10661
msgstr ""
10662
10663
#: en/help_topics/conflict-types.txt:114
10664
msgid ""
10665
"Note that if you have modified ``FILE.THIS`` or ``FILE.OTHER``, these\n"
10666
"modifications will be taken into account."
10667
msgstr ""
10668
10669
#: en/help_topics/conflict-types.txt:117
10670
msgid ""
10671
"Content conflicts\n"
10672
"-----------------"
10673
msgstr ""
10674
10675
#: en/help_topics/conflict-types.txt:122
10676
msgid " Contents conflict in FILE"
10677
msgstr ""
10678
10679
#: en/help_topics/conflict-types.txt:124
10680
msgid ""
10681
"This conflict happens when there are conflicting changes in the working "
10682
"tree\n"
10683
"and the merge source, but the conflicted items are not text files. They "
10684
"may\n"
10685
"be binary files, or symlinks, or directories. It can even happen with "
10686
"files\n"
10687
"that are deleted on one side, and modified on the other."
10688
msgstr ""
10689
10690
#: en/help_topics/conflict-types.txt:129
10691
msgid ""
10692
"Like text conflicts, Bazaar will emit THIS, OTHER and BASE files. (They may "
10693
"be\n"
10694
"regular files, symlinks or directories). But it will not include a \"main "
10695
"copy\"\n"
10696
"of the file with herringbone conflict markers. It will appear that the "
10697
"\"main\n"
10698
"copy\" has been renamed to THIS or OTHER."
10699
msgstr ""
10700
10701
#: en/help_topics/conflict-types.txt:134 en/help_topics/conflict-types.txt:182
10702
msgid ""
10703
"To resolve that kind of conflict, you should rebuild FILE from either "
10704
"version\n"
10705
"or a combination of both."
10706
msgstr ""
10707
10708
#: en/help_topics/conflict-types.txt:137 en/help_topics/conflict-types.txt:185
10709
#: en/help_topics/conflict-types.txt:226 en/help_topics/conflict-types.txt:252
10710
#: en/help_topics/conflict-types.txt:291 en/help_topics/conflict-types.txt:326
10711
#: en/help_topics/conflict-types.txt:361
10712
msgid "``bzr resolve`` recognizes the following actions:"
10713
msgstr ""
10714
10715
#: en/help_topics/conflict-types.txt:139
10716
msgid ""
10717
"* ``--action=take-this`` will issue ``bzr mv FILE.THIS FILE``,\n"
10718
"* ``--action=take-other`` will issue ``bzr mv FILE.OTHER FILE``,\n"
10719
"* ``--action=done`` will just mark the conflict as resolved."
10720
msgstr ""
10721
10722
#: en/help_topics/conflict-types.txt:143
10723
msgid ""
10724
"Any action will also delete the previously generated ``.BASE``, ``.THIS`` "
10725
"and\n"
10726
"``.OTHER`` files if they are still present in the working tree."
10727
msgstr ""
10728
10729
#: en/help_topics/conflict-types.txt:146 en/help_topics/conflict-types.txt:193
10730
#: en/help_topics/conflict-types.txt:234 en/help_topics/conflict-types.txt:276
10731
#: en/help_topics/conflict-types.txt:298 en/help_topics/conflict-types.txt:334
10732
#: en/help_topics/conflict-types.txt:369
10733
msgid ""
10734
"Bazaar cannot auto-detect when conflicts of this kind have been resolved."
10735
msgstr ""
10736
10737
#: en/help_topics/conflict-types.txt:148
10738
msgid ""
10739
"Tag conflicts\n"
10740
"-------------"
10741
msgstr ""
10742
10743
#: en/help_topics/conflict-types.txt:153
10744
msgid ""
10745
" Conflicting tags:\n"
10746
" version-0.1"
10747
msgstr ""
10748
10749
#: en/help_topics/conflict-types.txt:156
10750
msgid ""
10751
"When pulling from or pushing to another branch, Bazaar informs you about "
10752
"tags\n"
10753
"that conflict between the two branches; that is the same tag points to two\n"
10754
"different revisions. You need not resolve these conflicts, but subsequent\n"
10755
"uses of pull or push will result in the same message."
10756
msgstr ""
10757
10758
#: en/help_topics/conflict-types.txt:161
10759
msgid ""
10760
"To resolve the conflict, you must apply the correct tags to either the "
10761
"target\n"
10762
"branch or the source branch as appropriate. Use \"bzr tags --show-ids -d\n"
10763
"SOURCE_URL\" to see the tags in the source branch. If you want to make the\n"
10764
"target branch's tags match the source branch, then in the target branch do\n"
10765
"``bzr tag --force -r revid:REVISION_ID CONFLICTING_TAG`` for each of the\n"
10766
"CONFLICTING_TAGs, where REVISION_ID comes from the list of tags in the "
10767
"source\n"
10768
"branch. You need not call \"bzr resolve\" after doing this. To resolve in\n"
10769
"favor of the target branch, you need to similarly use ``tag --force`` in "
10770
"the\n"
10771
"source branch. (Note that pulling or pushing using --overwrite will "
10772
"overwrite\n"
10773
"all tags as well.)"
10774
msgstr ""
10775
10776
#: en/help_topics/conflict-types.txt:172
10777
msgid ""
10778
"Duplicate paths\n"
10779
"---------------"
10780
msgstr ""
10781
10782
#: en/help_topics/conflict-types.txt:177
10783
msgid " Conflict adding file FILE. Moved existing file to FILE.moved."
10784
msgstr ""
10785
10786
#: en/help_topics/conflict-types.txt:179
10787
msgid ""
10788
"Sometimes Bazaar will attempt to create a file using a pathname that has\n"
10789
"already been used. The existing file will be renamed to \"FILE.moved\". "
10790
msgstr ""
10791
10792
#: en/help_topics/conflict-types.txt:187
10793
msgid ""
10794
"* ``--action=take-this`` will issue ``bzr rm FILE ; bzr mv FILE.moved "
10795
"FILE``,\n"
10796
"* ``--action=take-other`` will issue ``bzr rm FILE.moved``,\n"
10797
"* ``--action=done`` will just mark the conflict as resolved."
10798
msgstr ""
10799
10800
#: en/help_topics/conflict-types.txt:191
10801
msgid ""
10802
"Note that you must get rid of FILE.moved before using ``--action=done``."
10803
msgstr ""
10804
10805
#: en/help_topics/conflict-types.txt:195
10806
msgid ""
10807
"Unversioned parent\n"
10808
"------------------"
10809
msgstr ""
10810
10811
#: en/help_topics/conflict-types.txt:200
10812
msgid ""
10813
" Conflict because FILE is not versioned, but has versioned children."
10814
msgstr ""
10815
10816
#: en/help_topics/conflict-types.txt:202
10817
msgid ""
10818
"Sometimes Bazaar will attempt to create a file whose parent directory is "
10819
"not\n"
10820
"versioned. This happens when the directory has been deleted in the target,\n"
10821
"but has a new child in the source, or vice versa. In this situation, "
10822
"Bazaar\n"
10823
"will version the parent directory as well. Resolving this issue depends\n"
10824
"very much on the particular scenario. You may wish to rename or delete "
10825
"either\n"
10826
"the file or the directory. When you are satisfied, you can run \"bzr "
10827
"resolve\n"
10828
"FILE\" to mark the conflict as resolved."
10829
msgstr ""
10830
10831
#: en/help_topics/conflict-types.txt:210
10832
msgid ""
10833
"Missing parent\n"
10834
"--------------"
10835
msgstr ""
10836
10837
#: en/help_topics/conflict-types.txt:215
10838
msgid " Conflict adding files to FILE. Created directory."
10839
msgstr ""
10840
10841
#: en/help_topics/conflict-types.txt:217
10842
msgid ""
10843
"This happens when a directory has been deleted in the target, but has new\n"
10844
"children in the source. This is similar to the \"unversioned parent\" "
10845
"conflict,\n"
10846
"except that the parent directory does not *exist*, instead of just being\n"
10847
"unversioned. In this situation, Bazaar will create the missing parent.\n"
10848
"Resolving this issue depends very much on the particular scenario."
10849
msgstr ""
10850
10851
#: en/help_topics/conflict-types.txt:223 en/help_topics/conflict-types.txt:249
10852
msgid ""
10853
"To resolve that kind of conflict, you should either remove or rename the\n"
10854
"children or the directory or a combination of both."
10855
msgstr ""
10856
10857
#: en/help_topics/conflict-types.txt:228
10858
msgid ""
10859
"* ``--action=take-this`` will issue ``bzr rm directory`` including the\n"
10860
" children,\n"
10861
"* ``--action=take-other`` will acknowledge Bazaar choice to keep the "
10862
"children\n"
10863
" and restoring the directory,\n"
10864
"* ``--action=done`` will just mark the conflict as resolved."
10865
msgstr ""
10866
10867
#: en/help_topics/conflict-types.txt:236
10868
msgid ""
10869
"Deleting parent\n"
10870
"---------------"
10871
msgstr ""
10872
10873
#: en/help_topics/conflict-types.txt:241
10874
msgid " Conflict: can't delete DIR because it is not empty. Not deleting."
10875
msgstr ""
10876
10877
#: en/help_topics/conflict-types.txt:243
10878
msgid ""
10879
"This is the opposite of \"missing parent\". A directory is deleted in the\n"
10880
"source, but has new children in the target (either because a directory\n"
10881
"deletion is merged or because the merge introduce new children). Bazaar\n"
10882
"will retain the directory. Resolving this issue depends very much on the\n"
10883
"particular scenario."
10884
msgstr ""
10885
10886
#: en/help_topics/conflict-types.txt:254
10887
msgid ""
10888
"* ``--action=take-this`` will acknowledge Bazaar choice to keep the "
10889
"directory,"
10890
msgstr ""
10891
10892
#: en/help_topics/conflict-types.txt:256
10893
msgid ""
10894
"* ``--action=take-other`` will issue ``bzr rm directory`` including the \n"
10895
" children,"
10896
msgstr ""
10897
10898
#: en/help_topics/conflict-types.txt:259
10899
msgid "* ``--action=done`` will just mark the conflict as resolved."
10900
msgstr ""
10901
10902
#: en/help_topics/conflict-types.txt:261
10903
msgid ""
10904
"Note that when merging a directory deletion, if unversioned files are\n"
10905
"present, they become potential orphans has they don't have a directory\n"
10906
"parent anymore."
10907
msgstr ""
10908
10909
#: en/help_topics/conflict-types.txt:265
10910
msgid ""
10911
"Handling such orphans, *before* the conflict is created, is controlled by\n"
10912
"setting the ``bzr.transform.orphan_policy`` configuration option."
10913
msgstr ""
10914
10915
#: en/help_topics/conflict-types.txt:268
10916
msgid "There are two possible values for this option:"
10917
msgstr ""
10918
10919
#: en/help_topics/conflict-types.txt:270
10920
msgid ""
10921
"* ``conflict`` (the default): will leave the orphans in place and\n"
10922
" generate a conflicts,"
10923
msgstr ""
10924
10925
#: en/help_topics/conflict-types.txt:273
10926
msgid ""
10927
"* ``move``: will move the orphans to a ``bzr-orphans`` directory at the "
10928
"root\n"
10929
" of the working tree with names like ``<file>.~#~``."
10930
msgstr ""
10931
10932
#: en/help_topics/conflict-types.txt:278
10933
msgid ""
10934
"Path conflict\n"
10935
"-------------"
10936
msgstr ""
10937
10938
#: en/help_topics/conflict-types.txt:283
10939
msgid " Path conflict: PATH1 / PATH2"
10940
msgstr ""
10941
10942
#: en/help_topics/conflict-types.txt:285
10943
msgid ""
10944
"This happens when the source and target have each modified the name or "
10945
"parent\n"
10946
"directory of a file. Bazaar will use the path elements from the source."
10947
msgstr ""
10948
10949
#: en/help_topics/conflict-types.txt:288
10950
msgid ""
10951
"To resolve that kind of conflict, you just have to decide what name should "
10952
"be\n"
10953
"retained for the file involved."
10954
msgstr ""
10955
10956
#: en/help_topics/conflict-types.txt:293
10957
msgid ""
10958
"* ``--action=take-this`` will revert Bazaar choice and keep ``PATH1`` by\n"
10959
" issuing ``bzr mv PATH2 PATH1``,\n"
10960
"* ``--action=take-other`` will acknowledge Bazaar choice of keeping "
10961
"``PATH2``,\n"
10962
"* ``--action=done`` will just mark the conflict as resolved."
10963
msgstr ""
10964
10965
#: en/help_topics/conflict-types.txt:300
10966
msgid ""
10967
"Parent loop\n"
10968
"-----------"
10969
msgstr ""
10970
10971
#: en/help_topics/conflict-types.txt:305
10972
msgid " Conflict moving FILE into DIRECTORY. Cancelled move."
10973
msgstr ""
10974
10975
#: en/help_topics/conflict-types.txt:307
10976
msgid ""
10977
"This happens when the source and the target have each moved directories, so\n"
10978
"that, if the change could be applied, a directory would be contained by "
10979
"itself.\n"
10980
"For example::"
10981
msgstr ""
10982
10983
#: en/help_topics/conflict-types.txt:311
10984
msgid ""
10985
" $ bzr init\n"
10986
" $ bzr mkdir white\n"
10987
" $ bzr mkdir black\n"
10988
" $ bzr commit -m \"BASE\"\n"
10989
" $ bzr branch . ../other\n"
10990
" $ bzr mv white black\n"
10991
" $ bzr commit -m \"THIS\"\n"
10992
" $ bzr mv ../other/black ../other/white\n"
10993
" $ bzr commit ../other -m \"OTHER\"\n"
10994
" $ bzr merge ../other"
10995
msgstr ""
10996
10997
#: en/help_topics/conflict-types.txt:322
10998
msgid ""
10999
"In this situation, Bazaar will cancel the move, and leave ``white`` in\n"
11000
"``black``. To resolve that kind of conflict, you just have to decide what\n"
11001
"name should be retained for the directories involved."
11002
msgstr ""
11003
11004
#: en/help_topics/conflict-types.txt:328
11005
msgid ""
11006
"* ``--action=take-this`` will acknowledge Bazaar choice of leaving ``white`` "
11007
"\n"
11008
" in ``black``,\n"
11009
"* ``--action=take-other`` will revert Bazaar choice and move ``black`` in\n"
11010
" ``white`` by issuing ``bzr mv black/white white ; bzr mv black white``,\n"
11011
"* ``--action=done`` will just mark the conflict as resolved."
11012
msgstr ""
11013
11014
#: en/help_topics/conflict-types.txt:336
11015
msgid ""
11016
"Non-directory parent\n"
11017
"--------------------"
11018
msgstr ""
11019
11020
#: en/help_topics/conflict-types.txt:341
11021
msgid ""
11022
" Conflict: foo.new is not a directory, but has files in it.\n"
11023
" Created directory."
11024
msgstr ""
11025
11026
#: en/help_topics/conflict-types.txt:344
11027
msgid ""
11028
"This happens when one side has added files to a directory, and the other "
11029
"side\n"
11030
"has changed the directory into a file or symlink. For example::"
11031
msgstr ""
11032
11033
#: en/help_topics/conflict-types.txt:347
11034
msgid ""
11035
" $ bzr init\n"
11036
" $ bzr mkdir foo\n"
11037
" $ bzr commit -m \"BASE\"\n"
11038
" $ bzr branch . ../other\n"
11039
" $ rmdir foo\n"
11040
" $ touch foo\n"
11041
" $ bzr commit -m \"THIS\"\n"
11042
" $ bzr mkdir ../other/foo/bar\n"
11043
" $ bzr commit ../other -m \"OTHER\"\n"
11044
" $ bzr merge ../other"
11045
msgstr ""
11046
11047
#: en/help_topics/conflict-types.txt:358
11048
msgid ""
11049
"To resolve that kind of conflict, you have to decide what name should be\n"
11050
"retained for the file, directory or symlink involved."
11051
msgstr ""
11052
11053
#: en/help_topics/conflict-types.txt:363
11054
msgid ""
11055
"* ``--action=take-this`` will issue ``bzr rm --force foo.new`` and \n"
11056
" ``bzr add foo``,\n"
11057
"* ``--action=take-other`` will issue ``bzr rm --force foo`` and \n"
11058
" ``bzr mv foo.new foo``,\n"
11059
"* ``--action=done`` will just mark the conflict as resolved."
11060
msgstr ""
11061
11062
#: en/help_topics/conflict-types.txt:371
11063
msgid ""
11064
"MalformedTransform\n"
11065
"------------------"
11066
msgstr ""
11067
11068
#: en/help_topics/conflict-types.txt:374
11069
msgid ""
11070
"It is possible (though very rare) for Bazaar to raise a MalformedTransform\n"
11071
"exception. This means that Bazaar encountered a filesystem conflict that it "
11072
"was\n"
11073
"unable to resolve. This usually indicates a bug. Please let us know if "
11074
"you\n"
11075
"encounter this. Our bug tracker is at https://launchpad.net/bzr/+bugs\n"
11076
msgstr ""
11077
11078
#: en/help_topics/content-filters.txt:1
11079
msgid ""
11080
"Content Filters\n"
11081
"==============="
11082
msgstr ""
11083
11084
#: en/help_topics/content-filters.txt:4
11085
msgid ""
11086
"Content formats\n"
11087
"---------------"
11088
msgstr ""
11089
11090
#: en/help_topics/content-filters.txt:7
11091
msgid ""
11092
"Bazaar's content filtering allows you to store files in a different\n"
11093
"format from the copy in your working tree. This lets you, or your\n"
11094
"co-developers, use Windows development tools that expect CRLF files\n"
11095
"on projects that use other line-ending conventions. Among other things,\n"
11096
"content filters also let Unix developers more easily work on projects\n"
11097
"using Windows line-ending conventions, keyword expansion/compression,\n"
11098
"and trailing spaces on lines in text files to be implicitly stripped\n"
11099
"when committed."
11100
msgstr ""
11101
11102
#: en/help_topics/content-filters.txt:16
11103
msgid "To generalize, there are two content formats supported by Bazaar:"
11104
msgstr ""
11105
11106
#: en/help_topics/content-filters.txt:18
11107
msgid ""
11108
"* a canonical format - how files are stored internally\n"
11109
"* a convenience format - how files are created in a working tree."
11110
msgstr ""
11111
11112
#: en/help_topics/content-filters.txt:21
11113
msgid ""
11114
"\n"
11115
"Format conversion\n"
11116
"-----------------"
11117
msgstr ""
11118
11119
#: en/help_topics/content-filters.txt:25
11120
msgid ""
11121
"The conversion between these formats is done by content filters.\n"
11122
"A content filter has two parts:"
11123
msgstr ""
11124
11125
#: en/help_topics/content-filters.txt:28
11126
msgid ""
11127
"* a read converter - converts from convenience to canonical format\n"
11128
"* a write converter - converts from canonical to convenience format."
11129
msgstr ""
11130
11131
#: en/help_topics/content-filters.txt:31
11132
msgid ""
11133
"Many of these converters will provide *round-trip* conversion,\n"
11134
"i.e. applying the read converter followed by the write converter\n"
11135
"gives back the original content. However, others may provide an\n"
11136
"asymmetric conversion. For example, a read converter might strip\n"
11137
"trailing whitespace off lines in source code while the matching\n"
11138
"write converter might pass content through unchanged."
11139
msgstr ""
11140
11141
#: en/help_topics/content-filters.txt:38
11142
msgid ""
11143
"\n"
11144
"Enabling content filters\n"
11145
"------------------------"
11146
msgstr ""
11147
11148
#: en/help_topics/content-filters.txt:42
11149
msgid ""
11150
"Content filters are typically provided by plugins, so the first step\n"
11151
"in using them is to install the relevant plugins and read their\n"
11152
"documentation. Some plugins may be very specific about which files\n"
11153
"they filter, e.g. only files ending in ``.java`` or ``.php``.\n"
11154
"In other cases, the plugin may leave it in the user's hands to\n"
11155
"define which files are to be filtered. This is typically done\n"
11156
"using rule-based preferences. See ``bzr help rules`` for general\n"
11157
"information about defining these."
11158
msgstr ""
11159
11160
#: en/help_topics/content-filters.txt:51
11161
msgid ""
11162
"\n"
11163
"Impact on commands\n"
11164
"------------------"
11165
msgstr ""
11166
11167
#: en/help_topics/content-filters.txt:55
11168
msgid ""
11169
"Read converters are only applied to commands that read content from\n"
11170
"a working tree, e.g. status, diff and commit. For example, ``bzr diff``\n"
11171
"will apply read converters to files in the working tree, then compare\n"
11172
"the results to the content last committed."
11173
msgstr ""
11174
11175
#: en/help_topics/content-filters.txt:60
11176
msgid ""
11177
"Write converters are only applied by commands that **create files in a\n"
11178
"working tree**, e.g. branch, checkout, update. If you wish to see the\n"
11179
"canonical format of a file or tree, use ``bzr cat`` or ``bzr export``\n"
11180
"respectively."
11181
msgstr ""
11182
11183
#: en/help_topics/content-filters.txt:65
11184
msgid ""
11185
"Note: ``bzr commit`` does not implicitly apply write converters after\n"
11186
"comitting files. If this makes sense for a given plugin providing\n"
11187
"a content filter, the plugin can usually achieve this effect by using a\n"
11188
"``start_commit`` or ``post_commit`` hook say. See :doc:`hooks-help`\n"
11189
"for more information on hooks."
11190
msgstr ""
11191
11192
#: en/help_topics/content-filters.txt:71
11193
msgid ""
11194
"\n"
11195
"Refreshing your working tree\n"
11196
"----------------------------"
11197
msgstr ""
11198
11199
#: en/help_topics/content-filters.txt:75
11200
msgid ""
11201
"For performance reasons, Bazaar caches the timestamps of files in\n"
11202
"a working tree, and assumes files are unchanged if their timestamps\n"
11203
"match the cached values. As a consequence, there are times when\n"
11204
"you may need to explicitly ask for content filtering to be reapplied\n"
11205
"in one or both directions, e.g. after installing or reconfiguring\n"
11206
"plugins providing it."
11207
msgstr ""
11208
11209
#: en/help_topics/content-filters.txt:82
11210
msgid "Here are some general guidelines for doing this:"
11211
msgstr ""
11212
11213
#: en/help_topics/content-filters.txt:84
11214
msgid ""
11215
" * To reapply read converters, ``touch`` files, i.e. update their\n"
11216
" timestamp. Operations like ``bzr status`` should then reapply the\n"
11217
" relevant read converters and compare the end result with the\n"
11218
" canonical format."
11219
msgstr ""
11220
11221
#: en/help_topics/content-filters.txt:89
11222
msgid ""
11223
" * To reapply write converters, ensure there are no local changes,\n"
11224
" delete the relevant files and run ``bzr revert`` on those files."
11225
msgstr ""
11226
11227
#: en/help_topics/content-filters.txt:92
11228
msgid ""
11229
"Note: In the future, it is likely that additional options will be added\n"
11230
"to commands to make this refreshing process faster and safer.\n"
11231
msgstr ""
11232
11233
#: en/help_topics/current-formats.txt:1
11234
msgid "Current Storage Formats"
11235
msgstr ""
11236
11237
#: en/help_topics/current-formats.txt:3
11238
msgid ""
11239
":2a:\n"
11240
" (native) (default) Format for the bzr 2.0 series. Uses group-\n"
11241
" compress storage. Provides rich roots which are a one-way\n"
11242
" transition."
11243
msgstr ""
11244
11245
#: en/help_topics/current-formats.txt:8 en/help_topics/other-formats.txt:17
11246
msgid ""
11247
"\n"
11248
"See :doc:`formats-help` for more about storage formats."
11249
msgstr ""
11250
11251
#: en/help_topics/debug-flags.txt:1
11252
msgid ""
11253
"Debug Flags\n"
11254
"==========="
11255
msgstr ""
11256
11257
#: en/help_topics/debug-flags.txt:4
11258
msgid ""
11259
"These flags can be passed on the bzr command line or (without the ``-D``\n"
11260
"prefix) put in the ``debug_flags`` variable in ``bazaar.conf``."
11261
msgstr ""
11262
11263
#: en/help_topics/debug-flags.txt:7
11264
msgid ""
11265
"-Dauth Trace authentication sections used.\n"
11266
"-Dbytes Print out how many bytes were transferred\n"
11267
"-Ddirstate Trace dirstate activity (verbose!)\n"
11268
"-Derror Instead of normal error handling, always print a "
11269
"traceback\n"
11270
" on error.\n"
11271
"-Devil Capture call sites that do expensive or badly-scaling\n"
11272
" operations.\n"
11273
"-Dfetch Trace history copying between repositories.\n"
11274
"-Dfilters Emit information for debugging content filtering.\n"
11275
"-Dforceinvdeltas Force use of inventory deltas during generic streaming "
11276
"fetch.\n"
11277
"-Dgraph Trace graph traversal.\n"
11278
"-Dhashcache Log every time a working file is read to determine its "
11279
"hash.\n"
11280
"-Dhooks Trace hook execution.\n"
11281
"-Dhpss Trace smart protocol requests and responses.\n"
11282
"-Dhpssdetail More hpss details.\n"
11283
"-Dhpssvfs Traceback on vfs access to Remote objects.\n"
11284
"-Dhttp Trace http connections, requests and responses.\n"
11285
"-Dindex Trace major index operations.\n"
11286
"-Dknit Trace knit operations.\n"
11287
"-Dlock Trace when lockdir locks are taken or released.\n"
11288
"-Dnoretry If a connection is reset, fail immediately rather than\n"
11289
" retrying the request.\n"
11290
"-Dprogress Trace progress bar operations.\n"
11291
"-Dmem_dump Dump memory to a file upon an out of memory error.\n"
11292
"-Dmerge Emit information for debugging merges.\n"
11293
"-Dno_apport Don't use apport to report crashes.\n"
11294
"-Dno_activity \t Don't show transport activity indicator in progress bar.\n"
11295
"-Dpack Emit information about pack operations.\n"
11296
"-Drelock Emit a message every time a branch or repository object "
11297
"is\n"
11298
" unlocked then relocked the same way.\n"
11299
"-Dsftp Trace SFTP internals.\n"
11300
"-Dstatic_tuple Error when a tuple is used where a StaticTuple is "
11301
"expected\n"
11302
"-Dstream Trace fetch streams.\n"
11303
"-Dstrict_locks Trace when OS locks are potentially used in a non-"
11304
"portable\n"
11305
" manner.\n"
11306
"-Dunlock Some errors during unlock are treated as warnings.\n"
11307
"-DIDS_never Never use InterDifferingSerializer when fetching.\n"
11308
"-DIDS_always Always use InterDifferingSerializer to fetch if "
11309
"appropriate\n"
11310
" for the format, even for non-local fetches.\n"
11311
msgstr ""
11312
11313
#: en/help_topics/diverged-branches.txt:1
11314
msgid ""
11315
"Diverged Branches\n"
11316
"================="
11317
msgstr ""
11318
11319
#: en/help_topics/diverged-branches.txt:4
11320
msgid ""
11321
"When Bazaar tries to push one branch onto another, it requires that the\n"
11322
"destination branch must be ready to receive the source branch. If this "
11323
"isn't\n"
11324
"the case, then we say that the branches have ``diverged``. Branches are\n"
11325
"considered diverged if the destination branch's most recent commit is one "
11326
"that\n"
11327
"has not been merged (directly or indirectly) by the source branch. To "
11328
"recover\n"
11329
"from diverged branches, one must merge the missing revisions into the "
11330
"source\n"
11331
"branch."
11332
msgstr ""
11333
11334
#: en/help_topics/diverged-branches.txt:12
11335
msgid ""
11336
"This situation commonly arises when using a centralized workflow with local\n"
11337
"commits. If someone else has committed new work to the mainline since your\n"
11338
"last pull and you have local commits that have not yet been pushed to the\n"
11339
"mainline, then your local branch and the mainline have diverged."
11340
msgstr ""
11341
11342
#: en/help_topics/diverged-branches.txt:17
11343
msgid ""
11344
"Discovering What Has Diverged\n"
11345
"-----------------------------"
11346
msgstr ""
11347
11348
#: en/help_topics/diverged-branches.txt:20
11349
msgid ""
11350
"The ``bzr missing`` command is used to find out what revisions are in "
11351
"another\n"
11352
"branch that are not present in the current branch, and vice-versa. It shows "
11353
"a\n"
11354
"summary of which extra revisions exist in each branch. If you want to see "
11355
"the\n"
11356
"precise effects of those revisions, you can use ``bzr diff --"
11357
"old=other_branch``\n"
11358
"to show the differences between other_branch and your current branch."
11359
msgstr ""
11360
11361
#: en/help_topics/diverged-branches.txt:26
11362
msgid ""
11363
"A Solution\n"
11364
"----------"
11365
msgstr ""
11366
11367
#: en/help_topics/diverged-branches.txt:29
11368
msgid ""
11369
"The solution is to merge the revisions from the mainline into your local\n"
11370
"branch. To do so, use ``bzr merge`` to get the new revisions from the\n"
11371
"mainline. This merge may result in conflicts if the other developer's "
11372
"changes\n"
11373
"overlap with your changes. These conflicts should be resolved before\n"
11374
"continuing. After any conflicts have been resolved, or even if there were "
11375
"no\n"
11376
"conflicts, Bazaar requires that you explicitly commit these new revisions\n"
11377
"to your local branch. This requirement gives you an opportunity to test "
11378
"the\n"
11379
"resulting working tree for correctness, since the merged revisions could "
11380
"have\n"
11381
"made arbitrary changes. After testing, you should commit the merge using\n"
11382
"``bzr commit``. This clears up the diverged branches situation. Your "
11383
"local\n"
11384
"branch can now be pushed to the mainline.\n"
11385
msgstr ""
11386
11387
#: en/help_topics/eol.txt:1
11388
msgid ""
11389
"End of Line Conversion\n"
11390
"======================"
11391
msgstr ""
11392
11393
#: en/help_topics/eol.txt:4
11394
msgid ""
11395
"EOL conversion is provided as a content filter where Bazaar internally\n"
11396
"stores a canonical format but outputs a convenience format. See\n"
11397
"``bzr help content-filters`` for general information about using these."
11398
msgstr ""
11399
11400
#: en/help_topics/eol.txt:8
11401
msgid ""
11402
"Note: Content filtering is only supported in recently added formats,\n"
11403
"e.g. 1.14. Be sure that both the repository *and* the branch are\n"
11404
"in a recent format. (Just setting the format on the repository\n"
11405
"is not enough.) If content filtering does not appear to be working, use\n"
11406
"'bzr info -v' to confirm that the branch is using \"Working tree format 5\"\n"
11407
"or later."
11408
msgstr ""
11409
11410
#: en/help_topics/eol.txt:15
11411
msgid ""
11412
"EOL conversion needs to be enabled for selected file patterns using\n"
11413
"rules. See ``bzr help rules`` for general information on defining rules.\n"
11414
"Currently, rules are only supported in $BZR_HOME/.bazaar/rules (or\n"
11415
"%BZR_HOME%/bazaar/2.0/rules on Windows). Branch specific rules will be\n"
11416
"supported in a future verison of Bazaar."
11417
msgstr ""
11418
11419
#: en/help_topics/eol.txt:21
11420
msgid ""
11421
"To configure which files to filter, set ``eol`` to one of the values below.\n"
11422
"(If a value is not set, ``exact`` is the default.)"
11423
msgstr ""
11424
11425
#: en/help_topics/eol.txt:24
11426
msgid ""
11427
" ========== ===================================== ======================\n"
11428
" Value Checkout end-of-lines as Commit end-of-lines as\n"
11429
" ========== ===================================== ======================\n"
11430
" ``native`` ``crlf`` on Windows, ``lf`` otherwise ``lf``\n"
11431
" ---------- ------------------------------------- ----------------------\n"
11432
" ``lf`` ``lf`` ``lf``\n"
11433
" ---------- ------------------------------------- ----------------------\n"
11434
" ``crlf`` ``crlf`` ``lf``\n"
11435
" ---------- ------------------------------------- ----------------------\n"
11436
" ``exact`` No conversion Exactly as in file\n"
11437
" ========== ===================================== ======================"
11438
msgstr ""
11439
11440
#: en/help_topics/eol.txt:36
11441
msgid ""
11442
"Note: For safety reasons, no conversion is applied to any file where a null\n"
11443
"byte is detected in the file."
11444
msgstr ""
11445
11446
#: en/help_topics/eol.txt:39
11447
msgid ""
11448
"For users working on a cross-platform project, here is a suggested rule\n"
11449
"to use as a starting point::"
11450
msgstr ""
11451
11452
#: en/help_topics/eol.txt:42 en/help_topics/eol.txt:52
11453
#: en/help_topics/eol.txt:67 en/help_topics/eol.txt:82
11454
msgid ""
11455
" [name *]\n"
11456
" eol = native"
11457
msgstr ""
11458
11459
#: en/help_topics/eol.txt:45
11460
msgid ""
11461
"If you have binary files that do not contain a null byte though, be\n"
11462
"sure to add ``eol = exact`` rules for those as well. You can do this\n"
11463
"by giving more explicit patterns earlier in the rules file. For example::"
11464
msgstr ""
11465
11466
#: en/help_topics/eol.txt:49
11467
msgid ""
11468
" [name *.png]\n"
11469
" eol = exact"
11470
msgstr ""
11471
11472
#: en/help_topics/eol.txt:55
11473
msgid ""
11474
"If your working tree is on a network drive shared by users on different\n"
11475
"operating systems, you typically want to force certain conventions for\n"
11476
"certain files. In that way, if a file is created with the wrong line\n"
11477
"endings or line endings get mixed during editing, it gets committed\n"
11478
"correctly and gets checked out correctly. For example::"
11479
msgstr ""
11480
11481
#: en/help_topics/eol.txt:61
11482
msgid ""
11483
" [name *.bat]\n"
11484
" eol = crlf"
11485
msgstr ""
11486
11487
#: en/help_topics/eol.txt:64
11488
msgid ""
11489
" [name *.sh]\n"
11490
" eol = lf"
11491
msgstr ""
11492
11493
#: en/help_topics/eol.txt:70
11494
msgid ""
11495
"If you take the care to create files with their required endings, you can\n"
11496
"achieve *almost* the same thing by using ``eol = exact``. It is slightly\n"
11497
"safer to use ``lf`` and ``crlf`` though because edits accidentally\n"
11498
"introducing mixed line endings will be corrected during commit for files\n"
11499
"with those settings."
11500
msgstr ""
11501
11502
#: en/help_topics/eol.txt:76
11503
msgid ""
11504
"If you have sample test data that deliberately has text files with mixed\n"
11505
"newline conventions, you can ask for those to be left alone like this::"
11506
msgstr ""
11507
11508
#: en/help_topics/eol.txt:79
11509
msgid ""
11510
" [name test_data/]\n"
11511
" eol = exact"
11512
msgstr ""
11513
11514
#: en/help_topics/eol.txt:85
11515
msgid ""
11516
"Note that ``exact`` does not imply the file is binary but it does mean\n"
11517
"that no conversion of end-of-lines will be done. (Bazaar currently relies\n"
11518
"of content analysis to detect binary files for commands like ``diff``.\n"
11519
"In the future, a ``binary = true`` rule may be added but it is not\n"
11520
"supported yet.)"
11521
msgstr ""
11522
11523
#: en/help_topics/eol.txt:91
11524
msgid ""
11525
"If you have an existing repository with text files already stored using\n"
11526
"Windows newline conventions (``crlf``), then you may want to keep using "
11527
"that\n"
11528
"convention in the repository. Forcing certain files to this convention\n"
11529
"may also help users who do not have rules configured. To do this, set\n"
11530
"``eol`` to one of the values below."
11531
msgstr ""
11532
11533
#: en/help_topics/eol.txt:97
11534
msgid ""
11535
" ============================ ======================== "
11536
"======================\n"
11537
" Value Checkout end-of-lines as Commit end-of-lines "
11538
"as\n"
11539
" ============================ ======================== "
11540
"======================\n"
11541
" ``native-with-crlf-in-repo`` ``crlf`` on Windows, ``crlf``\n"
11542
" ``lf`` otherwise\n"
11543
" ---------------------------- ------------------------ ----------------------"
11544
"\n"
11545
" ``lf-with-crlf-in-repo`` ``lf`` ``crlf``\n"
11546
" ---------------------------- ------------------------ ----------------------"
11547
"\n"
11548
" ``crlf-with-crlf-in-repo`` ``crlf`` ``crlf``\n"
11549
" ============================ ======================== ======================"
11550
msgstr ""
11551
11552
#: en/help_topics/eol.txt:108
11553
msgid ""
11554
"For users working on an existing project that uses Windows newline\n"
11555
"conventions in their Bazaar repository, this rule is suggested as a\n"
11556
"starting point::"
11557
msgstr ""
11558
11559
#: en/help_topics/eol.txt:112
11560
msgid ""
11561
" [name *]\n"
11562
" eol = native-with-crlf-in-repo"
11563
msgstr ""
11564
11565
#: en/help_topics/eol.txt:115
11566
msgid ""
11567
"For new projects, it is recommended that end-of-lines be stored as ``lf``\n"
11568
"and that users stick to the basic settings, i.e. ``native``, ``lf``,\n"
11569
"``crlf`` and ``exact``."
11570
msgstr ""
11571
11572
#: en/help_topics/eol.txt:119
11573
msgid ""
11574
"Note: Bazaar's EOL conversion will convert the content of files but\n"
11575
"never reject files because a given line ending or mixed line endings\n"
11576
"are found. A precommit hook should be used if you wish to validate\n"
11577
"(and not just convert) content before committing.\n"
11578
msgstr ""
11579
11580
#: en/help_topics/hidden-commands.txt:1
11581
msgid ""
11582
"added List files added in working tree.\n"
11583
"ancestry List all revisions merged into this branch.\n"
11584
"assert-fail Test reporting of assertion failures\n"
11585
"bundle-info Output interesting stats about a bundle\n"
11586
"bundle-revisions Create a merge-directive for submitting changes.\n"
11587
"cat-revision Write out metadata for a revision.\n"
11588
"dump-btree Dump the contents of a btree index file to stdout.\n"
11589
"export-pot Export command helps and error messages in po format.\n"
11590
"file-id Print file_id of a particular file or directory.\n"
11591
"file-path Print path of file_ids to a file or directory.\n"
11592
"find-merge-base Find and print a base revision for merging two "
11593
"branches.\n"
11594
"hooks Show hooks.\n"
11595
"inventory Show inventory of the current working copy or a "
11596
"revision.\n"
11597
"local-time-offset Show the offset in seconds from GMT to local time.\n"
11598
"lookup-revision Lookup the revision-id from a revision-number\n"
11599
"merge-directive Generate a merge directive for auto-merge tools.\n"
11600
"modified List files modified in working tree.\n"
11601
"re-sign Create a digital signature for an existing revision.\n"
11602
"reference list, view and set branch locations for nested trees.\n"
11603
"relpath Show path of a file relative to root\n"
11604
"repair-workingtree Reset the working tree state file.\n"
11605
"revision-history Display the list of revision ids on a branch.\n"
11606
"revision-info Show revision number and revision id for a given "
11607
"revision\n"
11608
" identifier.\n"
11609
"rocks Statement of optimism.\n"
11610
"selftest Run internal test suite.\n"
11611
"shell-complete Show appropriate completions for context.\n"
11612
"test-script Run a shell-like test from a file.\n"
11613
"touching-revisions Return revision-ids which affected a particular file.\n"
11614
"unknowns List unknown files.\n"
11615
"wait-until-signalled Test helper for\n"
11616
" test_start_and_stop_bzr_subprocess_send_signal.\n"
11617
msgstr ""
11618
11619
#: en/help_topics/hooks.txt:1
11620
msgid ""
11621
"\n"
11622
"Hooks\n"
11623
"====="
11624
msgstr ""
11625
11626
#: en/help_topics/hooks.txt:5 en/help_topics/rules.txt:4
11627
msgid ""
11628
"Introduction\n"
11629
"------------"
11630
msgstr ""
11631
11632
#: en/help_topics/hooks.txt:8
11633
msgid "A hook of type *xxx* of class *yyy* needs to be registered using::"
11634
msgstr ""
11635
11636
#: en/help_topics/hooks.txt:10
11637
msgid " yyy.hooks.install_named_hook(\"xxx\", ...)"
11638
msgstr ""
11639
11640
#: en/help_topics/hooks.txt:12
11641
msgid ""
11642
"See :doc:`Using hooks<../user-guide/hooks>` in the User Guide for examples."
11643
msgstr ""
11644
11645
#: en/help_topics/hooks.txt:14
11646
msgid ""
11647
"The class that contains each hook is given before the hooks it supplies. "
11648
"For\n"
11649
"instance, BranchHooks as the class is the hooks class for\n"
11650
"`bzrlib.branch.Branch.hooks`."
11651
msgstr ""
11652
11653
#: en/help_topics/hooks.txt:18
11654
msgid ""
11655
"Each description also indicates whether the hook runs on the client (the\n"
11656
"machine where bzr was invoked) or the server (the machine addressed by\n"
11657
"the branch URL). These may be, but are not necessarily, the same machine."
11658
msgstr ""
11659
11660
#: en/help_topics/hooks.txt:22
11661
msgid ""
11662
"Plugins (including hooks) are run on the server if all of these is true:"
11663
msgstr ""
11664
11665
#: en/help_topics/hooks.txt:24
11666
msgid ""
11667
" * The connection is via a smart server (accessed with a URL starting with\n"
11668
" \"bzr://\", \"bzr+ssh://\" or \"bzr+http://\", or accessed via a "
11669
"\"http://\"\n"
11670
" URL when a smart server is available via HTTP)."
11671
msgstr ""
11672
11673
#: en/help_topics/hooks.txt:28
11674
msgid ""
11675
" * The hook is either server specific or part of general infrastructure "
11676
"rather\n"
11677
" than client specific code (such as commit)."
11678
msgstr ""
11679
11680
#: en/help_topics/hooks.txt:31
11681
msgid ""
11682
"\n"
11683
"BranchHooks\n"
11684
"-----------"
11685
msgstr ""
11686
11687
#: en/help_topics/hooks.txt:35
11688
msgid ""
11689
"automatic_tag_name\n"
11690
"~~~~~~~~~~~~~~~~~~"
11691
msgstr ""
11692
11693
#: en/help_topics/hooks.txt:38 en/help_topics/hooks.txt:56
11694
#: en/help_topics/hooks.txt:102 en/help_topics/hooks.txt:259
11695
msgid "Introduced in: 2.2"
11696
msgstr ""
11697
11698
#: en/help_topics/hooks.txt:40
11699
msgid ""
11700
"Called to determine an automatic tag name for a revision.\n"
11701
"automatic_tag_name is called with (branch, revision_id) and should\n"
11702
"return a tag name or None if no tag name could be determined. The\n"
11703
"first non-None tag name returned will be used."
11704
msgstr ""
11705
11706
#: en/help_topics/hooks.txt:45
11707
msgid ""
11708
"open\n"
11709
"~~~~"
11710
msgstr ""
11711
11712
#: en/help_topics/hooks.txt:48 en/help_topics/hooks.txt:290
11713
#: en/help_topics/hooks.txt:304
11714
msgid "Introduced in: 1.8"
11715
msgstr ""
11716
11717
#: en/help_topics/hooks.txt:50
11718
msgid ""
11719
"Called with the Branch object that has been opened after a branch is\n"
11720
"opened."
11721
msgstr ""
11722
11723
#: en/help_topics/hooks.txt:53
11724
msgid ""
11725
"post_branch_init\n"
11726
"~~~~~~~~~~~~~~~~"
11727
msgstr ""
11728
11729
#: en/help_topics/hooks.txt:58
11730
msgid ""
11731
"Called after new branch initialization completes. post_branch_init is\n"
11732
"called with a bzrlib.branch.BranchInitHookParams. Note that init,\n"
11733
"branch and checkout (both heavyweight and lightweight) will all\n"
11734
"trigger this hook."
11735
msgstr ""
11736
11737
#: en/help_topics/hooks.txt:63
11738
msgid ""
11739
"post_change_branch_tip\n"
11740
"~~~~~~~~~~~~~~~~~~~~~~"
11741
msgstr ""
11742
11743
#: en/help_topics/hooks.txt:66 en/help_topics/hooks.txt:418
11744
msgid "Introduced in: 1.4"
11745
msgstr ""
11746
11747
#: en/help_topics/hooks.txt:68
11748
msgid ""
11749
"Called in bzr client and server after a change to the tip of a branch\n"
11750
"is made. post_change_branch_tip is called with a\n"
11751
"bzrlib.branch.ChangeBranchTipParams. Note that push, pull, commit,\n"
11752
"uncommit will all trigger this hook."
11753
msgstr ""
11754
11755
#: en/help_topics/hooks.txt:73 en/help_topics/hooks.txt:389
11756
msgid ""
11757
"post_commit\n"
11758
"~~~~~~~~~~~"
11759
msgstr ""
11760
11761
#: en/help_topics/hooks.txt:76 en/help_topics/hooks.txt:86
11762
#: en/help_topics/hooks.txt:94 en/help_topics/hooks.txt:110
11763
#: en/help_topics/hooks.txt:145
11764
msgid "Introduced in: 0.15"
11765
msgstr ""
11766
11767
#: en/help_topics/hooks.txt:78
11768
msgid ""
11769
"Called in the bzr client after a commit has completed. post_commit is\n"
11770
"called with (local, master, old_revno, old_revid, new_revno,\n"
11771
"new_revid). old_revid is NULL_REVISION for the first commit to a\n"
11772
"branch."
11773
msgstr ""
11774
11775
#: en/help_topics/hooks.txt:83
11776
msgid ""
11777
"post_pull\n"
11778
"~~~~~~~~~"
11779
msgstr ""
11780
11781
#: en/help_topics/hooks.txt:88
11782
msgid ""
11783
"Called after a pull operation completes. post_pull is called with a\n"
11784
"bzrlib.branch.PullResult object and only runs in the bzr client."
11785
msgstr ""
11786
11787
#: en/help_topics/hooks.txt:91
11788
msgid ""
11789
"post_push\n"
11790
"~~~~~~~~~"
11791
msgstr ""
11792
11793
#: en/help_topics/hooks.txt:96
11794
msgid ""
11795
"Called after a push operation completes. post_push is called with a\n"
11796
"bzrlib.branch.BranchPushResult object and only runs in the bzr client."
11797
msgstr ""
11798
11799
#: en/help_topics/hooks.txt:99
11800
msgid ""
11801
"post_switch\n"
11802
"~~~~~~~~~~~"
11803
msgstr ""
11804
11805
#: en/help_topics/hooks.txt:104
11806
msgid ""
11807
"Called after a checkout switches branch. post_switch is called with a\n"
11808
"bzrlib.branch.SwitchHookParams."
11809
msgstr ""
11810
11811
#: en/help_topics/hooks.txt:107
11812
msgid ""
11813
"post_uncommit\n"
11814
"~~~~~~~~~~~~~"
11815
msgstr ""
11816
11817
#: en/help_topics/hooks.txt:112
11818
msgid ""
11819
"Called in the bzr client after an uncommit completes. post_uncommit is\n"
11820
"called with (local, master, old_revno, old_revid, new_revno,\n"
11821
"new_revid) where local is the local branch or None, master is the\n"
11822
"target branch, and an empty branch receives new_revno of 0, new_revid\n"
11823
"of None."
11824
msgstr ""
11825
11826
#: en/help_topics/hooks.txt:118
11827
msgid ""
11828
"pre_change_branch_tip\n"
11829
"~~~~~~~~~~~~~~~~~~~~~"
11830
msgstr ""
11831
11832
#: en/help_topics/hooks.txt:121
11833
msgid "Introduced in: 1.6"
11834
msgstr ""
11835
11836
#: en/help_topics/hooks.txt:123
11837
msgid ""
11838
"Called in bzr client and server before a change to the tip of a branch\n"
11839
"is made. pre_change_branch_tip is called with a\n"
11840
"bzrlib.branch.ChangeBranchTipParams. Note that push, pull, commit,\n"
11841
"uncommit will all trigger this hook."
11842
msgstr ""
11843
11844
#: en/help_topics/hooks.txt:128
11845
msgid ""
11846
"pre_commit\n"
11847
"~~~~~~~~~~"
11848
msgstr ""
11849
11850
#: en/help_topics/hooks.txt:131
11851
msgid "Introduced in: 0.91"
11852
msgstr ""
11853
11854
#: en/help_topics/hooks.txt:133
11855
msgid ""
11856
"Called after a commit is calculated but before it is completed.\n"
11857
"pre_commit is called with (local, master, old_revno, old_revid,\n"
11858
"future_revno, future_revid, tree_delta, future_tree). old_revid is\n"
11859
"NULL_REVISION for the first commit to a branch, tree_delta is a\n"
11860
"TreeDelta object describing changes from the basis revision. hooks\n"
11861
"MUST NOT modify this delta. future_tree is an in-memory tree obtained\n"
11862
"from CommitBuilder.revision_tree() and hooks MUST NOT modify this\n"
11863
"tree."
11864
msgstr ""
11865
11866
#: en/help_topics/hooks.txt:142
11867
msgid ""
11868
"set_rh\n"
11869
"~~~~~~"
11870
msgstr ""
11871
11872
#: en/help_topics/hooks.txt:147
11873
msgid ""
11874
"Invoked whenever the revision history has been set via\n"
11875
"set_revision_history. The api signature is (branch, revision_history),\n"
11876
"and the branch will be write-locked. The set_rh hook can be expensive\n"
11877
"for bzr to trigger, a better hook to use is\n"
11878
"Branch.post_change_branch_tip."
11879
msgstr ""
11880
11881
#: en/help_topics/hooks.txt:153
11882
msgid ""
11883
"transform_fallback_location\n"
11884
"~~~~~~~~~~~~~~~~~~~~~~~~~~~"
11885
msgstr ""
11886
11887
#: en/help_topics/hooks.txt:156
11888
msgid "Introduced in: 1.9"
11889
msgstr ""
11890
11891
#: en/help_topics/hooks.txt:158
11892
msgid ""
11893
"Called when a stacked branch is activating its fallback locations.\n"
11894
"transform_fallback_location is called with (branch, url), and should\n"
11895
"return a new url. Returning the same url allows it to be used as-is,\n"
11896
"returning a different one can be used to cause the branch to stack on\n"
11897
"a closer copy of that fallback_location. Note that the branch cannot\n"
11898
"have history accessing methods called on it during this hook because\n"
11899
"the fallback locations have not been activated. When there are\n"
11900
"multiple hooks installed for transform_fallback_location, all are\n"
11901
"called with the url returned from the previous hook.The order is\n"
11902
"however undefined."
11903
msgstr ""
11904
11905
#: en/help_topics/hooks.txt:169
11906
msgid ""
11907
"CommandHooks\n"
11908
"------------"
11909
msgstr ""
11910
11911
#: en/help_topics/hooks.txt:172
11912
msgid ""
11913
"extend_command\n"
11914
"~~~~~~~~~~~~~~"
11915
msgstr ""
11916
11917
#: en/help_topics/hooks.txt:175
11918
msgid "Introduced in: 1.13"
11919
msgstr ""
11920
11921
#: en/help_topics/hooks.txt:177
11922
msgid ""
11923
"Called after creating a command object to allow modifications such as\n"
11924
"adding or removing options, docs etc. Called with the new\n"
11925
"bzrlib.commands.Command object."
11926
msgstr ""
11927
11928
#: en/help_topics/hooks.txt:181
11929
msgid ""
11930
"get_command\n"
11931
"~~~~~~~~~~~"
11932
msgstr ""
11933
11934
#: en/help_topics/hooks.txt:184 en/help_topics/hooks.txt:196
11935
#: en/help_topics/hooks.txt:205 en/help_topics/hooks.txt:464
11936
msgid "Introduced in: 1.17"
11937
msgstr ""
11938
11939
#: en/help_topics/hooks.txt:186
11940
msgid ""
11941
"Called when creating a single command. Called with (cmd_or_None,\n"
11942
"command_name). get_command should either return the cmd_or_None\n"
11943
"parameter, or a replacement Command object that should be used for the\n"
11944
"command. Note that the Command.hooks hooks are core infrastructure.\n"
11945
"Many users will prefer to use bzrlib.commands.register_command or\n"
11946
"plugin_cmds.register_lazy."
11947
msgstr ""
11948
11949
#: en/help_topics/hooks.txt:193
11950
msgid ""
11951
"get_missing_command\n"
11952
"~~~~~~~~~~~~~~~~~~~"
11953
msgstr ""
11954
11955
#: en/help_topics/hooks.txt:198
11956
msgid ""
11957
"Called when creating a single command if no command could be found.\n"
11958
"Called with (command_name). get_missing_command should either return\n"
11959
"None, or a Command object to be used for the command."
11960
msgstr ""
11961
11962
#: en/help_topics/hooks.txt:202
11963
msgid ""
11964
"list_commands\n"
11965
"~~~~~~~~~~~~~"
11966
msgstr ""
11967
11968
#: en/help_topics/hooks.txt:207
11969
msgid ""
11970
"Called when enumerating commands. Called with a set of cmd_name\n"
11971
"strings for all the commands found so far. This set is safe to mutate\n"
11972
"- e.g. to remove a command. list_commands should return the updated\n"
11973
"set of command names."
11974
msgstr ""
11975
11976
#: en/help_topics/hooks.txt:212
11977
msgid ""
11978
"_ConfigHooks\n"
11979
"------------"
11980
msgstr ""
11981
11982
#: en/help_topics/hooks.txt:215
11983
msgid ""
11984
"get\n"
11985
"~~~"
11986
msgstr ""
11987
11988
#: en/help_topics/hooks.txt:218 en/help_topics/hooks.txt:226
11989
#: en/help_topics/hooks.txt:233 en/help_topics/hooks.txt:241
11990
#: en/help_topics/hooks.txt:248 en/help_topics/hooks.txt:370
11991
#: en/help_topics/hooks.txt:443
11992
msgid "Introduced in: 2.4"
11993
msgstr ""
11994
11995
#: en/help_topics/hooks.txt:220
11996
msgid ""
11997
"Invoked when a config option is read. The signature is (stack, name,\n"
11998
"value)."
11999
msgstr ""
12000
12001
#: en/help_topics/hooks.txt:223
12002
msgid ""
12003
"load\n"
12004
"~~~~"
12005
msgstr ""
12006
12007
#: en/help_topics/hooks.txt:228
12008
msgid "Invoked when a config store is loaded. The signature is (store)."
12009
msgstr ""
12010
12011
#: en/help_topics/hooks.txt:230
12012
msgid ""
12013
"remove\n"
12014
"~~~~~~"
12015
msgstr ""
12016
12017
#: en/help_topics/hooks.txt:235
12018
msgid ""
12019
"Invoked when a config option is removed. The signature is (stack,\n"
12020
"name)."
12021
msgstr ""
12022
12023
#: en/help_topics/hooks.txt:238
12024
msgid ""
12025
"save\n"
12026
"~~~~"
12027
msgstr ""
12028
12029
#: en/help_topics/hooks.txt:243
12030
msgid "Invoked when a config store is saved. The signature is (store)."
12031
msgstr ""
12032
12033
#: en/help_topics/hooks.txt:245
12034
msgid ""
12035
"set\n"
12036
"~~~"
12037
msgstr ""
12038
12039
#: en/help_topics/hooks.txt:250
12040
msgid ""
12041
"Invoked when a config option is set. The signature is (stack, name,\n"
12042
"value)."
12043
msgstr ""
12044
12045
#: en/help_topics/hooks.txt:253
12046
msgid ""
12047
"ControlDirHooks\n"
12048
"---------------"
12049
msgstr ""
12050
12051
#: en/help_topics/hooks.txt:256
12052
msgid ""
12053
"post_repo_init\n"
12054
"~~~~~~~~~~~~~~"
12055
msgstr ""
12056
12057
#: en/help_topics/hooks.txt:261
12058
msgid ""
12059
"Invoked after a repository has been initialized. post_repo_init is\n"
12060
"called with a bzrlib.controldir.RepoInitHookParams."
12061
msgstr ""
12062
12063
#: en/help_topics/hooks.txt:264
12064
msgid ""
12065
"pre_open\n"
12066
"~~~~~~~~"
12067
msgstr ""
12068
12069
#: en/help_topics/hooks.txt:267
12070
msgid "Introduced in: 1.14"
12071
msgstr ""
12072
12073
#: en/help_topics/hooks.txt:269
12074
msgid ""
12075
"Invoked before attempting to open a ControlDir with the transport that\n"
12076
"the open will use."
12077
msgstr ""
12078
12079
#: en/help_topics/hooks.txt:272
12080
msgid ""
12081
"InfoHooks\n"
12082
"---------"
12083
msgstr ""
12084
12085
#: en/help_topics/hooks.txt:275
12086
msgid ""
12087
"repository\n"
12088
"~~~~~~~~~~"
12089
msgstr ""
12090
12091
#: en/help_topics/hooks.txt:278 en/help_topics/hooks.txt:297
12092
#: en/help_topics/hooks.txt:521
12093
msgid "Introduced in: 1.15"
12094
msgstr ""
12095
12096
#: en/help_topics/hooks.txt:280
12097
msgid ""
12098
"Invoked when displaying the statistics for a repository. repository is\n"
12099
"called with a statistics dictionary as returned by the repository and\n"
12100
"a file-like object to write to."
12101
msgstr ""
12102
12103
#: en/help_topics/hooks.txt:284
12104
msgid ""
12105
"LockHooks\n"
12106
"---------"
12107
msgstr ""
12108
12109
#: en/help_topics/hooks.txt:287
12110
msgid ""
12111
"lock_acquired\n"
12112
"~~~~~~~~~~~~~"
12113
msgstr ""
12114
12115
#: en/help_topics/hooks.txt:292
12116
msgid ""
12117
"Called with a bzrlib.lock.LockResult when a physical lock is acquired."
12118
msgstr ""
12119
12120
#: en/help_topics/hooks.txt:294
12121
msgid ""
12122
"lock_broken\n"
12123
"~~~~~~~~~~~"
12124
msgstr ""
12125
12126
#: en/help_topics/hooks.txt:299
12127
msgid "Called with a bzrlib.lock.LockResult when a physical lock is broken."
12128
msgstr ""
12129
12130
#: en/help_topics/hooks.txt:301
12131
msgid ""
12132
"lock_released\n"
12133
"~~~~~~~~~~~~~"
12134
msgstr ""
12135
12136
#: en/help_topics/hooks.txt:306
12137
msgid ""
12138
"Called with a bzrlib.lock.LockResult when a physical lock is released."
12139
msgstr ""
12140
12141
#: en/help_topics/hooks.txt:308
12142
msgid ""
12143
"MergeHooks\n"
12144
"----------"
12145
msgstr ""
12146
12147
#: en/help_topics/hooks.txt:311
12148
msgid ""
12149
"merge_file_content\n"
12150
"~~~~~~~~~~~~~~~~~~"
12151
msgstr ""
12152
12153
#: en/help_topics/hooks.txt:314
12154
msgid "Introduced in: 2.1"
12155
msgstr ""
12156
12157
#: en/help_topics/hooks.txt:316
12158
msgid ""
12159
"Called with a bzrlib.merge.Merger object to create a per file merge\n"
12160
"object when starting a merge. Should return either None or a subclass\n"
12161
"of ``bzrlib.merge.AbstractPerFileMerger``. Such objects will then be\n"
12162
"called per file that needs to be merged (including when one side has\n"
12163
"deleted the file and the other has changed it). See the\n"
12164
"AbstractPerFileMerger API docs for details on how it is used by merge."
12165
msgstr ""
12166
12167
#: en/help_topics/hooks.txt:323
12168
msgid ""
12169
"post_merge\n"
12170
"~~~~~~~~~~"
12171
msgstr ""
12172
12173
#: en/help_topics/hooks.txt:326 en/help_topics/hooks.txt:334
12174
#: en/help_topics/hooks.txt:384 en/help_topics/hooks.txt:402
12175
#: en/help_topics/hooks.txt:410 en/help_topics/hooks.txt:509
12176
msgid "Introduced in: 2.5"
12177
msgstr ""
12178
12179
#: en/help_topics/hooks.txt:328
12180
msgid ""
12181
"Called after a merge. Receives a Merger object as the single argument.\n"
12182
"The return value is ignored."
12183
msgstr ""
12184
12185
#: en/help_topics/hooks.txt:331
12186
msgid ""
12187
"pre_merge\n"
12188
"~~~~~~~~~"
12189
msgstr ""
12190
12191
#: en/help_topics/hooks.txt:336
12192
msgid ""
12193
"Called before a merge. Receives a Merger object as the single\n"
12194
"argument."
12195
msgstr ""
12196
12197
#: en/help_topics/hooks.txt:339
12198
msgid ""
12199
"MergeDirectiveHooks\n"
12200
"-------------------"
12201
msgstr ""
12202
12203
#: en/help_topics/hooks.txt:342
12204
msgid ""
12205
"merge_request_body\n"
12206
"~~~~~~~~~~~~~~~~~~"
12207
msgstr ""
12208
12209
#: en/help_topics/hooks.txt:345
12210
msgid "Introduced in: 1.15.0"
12211
msgstr ""
12212
12213
#: en/help_topics/hooks.txt:347
12214
msgid ""
12215
"Called with a MergeRequestBodyParams when a body is needed for a merge\n"
12216
"request. Callbacks must return a body. If more than one callback is\n"
12217
"registered, the output of one callback is provided to the next."
12218
msgstr ""
12219
12220
#: en/help_topics/hooks.txt:351
12221
msgid ""
12222
"MessageEditorHooks\n"
12223
"------------------"
12224
msgstr ""
12225
12226
#: en/help_topics/hooks.txt:354
12227
msgid ""
12228
"commit_message_template\n"
12229
"~~~~~~~~~~~~~~~~~~~~~~~"
12230
msgstr ""
12231
12232
#: en/help_topics/hooks.txt:357
12233
msgid "Introduced in: 1.10"
12234
msgstr ""
12235
12236
#: en/help_topics/hooks.txt:359
12237
msgid ""
12238
"Called when a commit message is being generated.\n"
12239
"commit_message_template is called with the bzrlib.commit.Commit object\n"
12240
"and the message that is known so far. commit_message_template must\n"
12241
"return a new message to use (which could be the same as it was given).\n"
12242
"When there are multiple hooks registered for commit_message_template,\n"
12243
"they are chained with the result from the first passed into the\n"
12244
"second, and so on."
12245
msgstr ""
12246
12247
#: en/help_topics/hooks.txt:367
12248
msgid ""
12249
"set_commit_message\n"
12250
"~~~~~~~~~~~~~~~~~~"
12251
msgstr ""
12252
12253
#: en/help_topics/hooks.txt:372
12254
msgid ""
12255
"Set a fixed commit message. set_commit_message is called with the\n"
12256
"bzrlib.commit.Commit object (so you can also change e.g. revision\n"
12257
"properties by editing commit.builder._revprops) and the message so\n"
12258
"far. set_commit_message must return the message to use or None if it\n"
12259
"should use the message editor as normal."
12260
msgstr ""
12261
12262
#: en/help_topics/hooks.txt:378
12263
msgid ""
12264
"MutableTreeHooks\n"
12265
"----------------"
12266
msgstr ""
12267
12268
#: en/help_topics/hooks.txt:381
12269
msgid ""
12270
"post_build_tree\n"
12271
"~~~~~~~~~~~~~~~"
12272
msgstr ""
12273
12274
#: en/help_topics/hooks.txt:386
12275
msgid ""
12276
"Called after a completely new tree is built. The hook is called with\n"
12277
"the tree as its only argument."
12278
msgstr ""
12279
12280
#: en/help_topics/hooks.txt:392
12281
msgid "Introduced in: 2.0"
12282
msgstr ""
12283
12284
#: en/help_topics/hooks.txt:394
12285
msgid ""
12286
"Called after a commit is performed on a tree. The hook is called with\n"
12287
"a bzrlib.mutabletree.PostCommitHookParams object. The mutable tree the\n"
12288
"commit was performed on is available via the mutable_tree attribute of\n"
12289
"that object."
12290
msgstr ""
12291
12292
#: en/help_topics/hooks.txt:399
12293
msgid ""
12294
"post_transform\n"
12295
"~~~~~~~~~~~~~~"
12296
msgstr ""
12297
12298
#: en/help_topics/hooks.txt:404
12299
msgid ""
12300
"Called after a tree transform has been performed on a tree. The hook\n"
12301
"is called with the tree that is being transformed and the transform."
12302
msgstr ""
12303
12304
#: en/help_topics/hooks.txt:407
12305
msgid ""
12306
"pre_transform\n"
12307
"~~~~~~~~~~~~~"
12308
msgstr ""
12309
12310
#: en/help_topics/hooks.txt:412
12311
msgid ""
12312
"Called before a tree transform on this tree. The hook is called with\n"
12313
"the tree that is being transformed and the transform."
12314
msgstr ""
12315
12316
#: en/help_topics/hooks.txt:415
12317
msgid ""
12318
"start_commit\n"
12319
"~~~~~~~~~~~~"
12320
msgstr ""
12321
12322
#: en/help_topics/hooks.txt:420
12323
msgid ""
12324
"Called before a commit is performed on a tree. The start commit hook\n"
12325
"is able to change the tree before the commit takes place. start_commit\n"
12326
"is called with the bzrlib.mutabletree.MutableTree that the commit is\n"
12327
"being performed on."
12328
msgstr ""
12329
12330
#: en/help_topics/hooks.txt:425
12331
msgid ""
12332
"SmartClientHooks\n"
12333
"----------------"
12334
msgstr ""
12335
12336
#: en/help_topics/hooks.txt:428
12337
msgid ""
12338
"call\n"
12339
"~~~~"
12340
msgstr ""
12341
12342
#: en/help_topics/hooks.txt:431
12343
msgid "Introduced in: unknown"
12344
msgstr ""
12345
12346
#: en/help_topics/hooks.txt:433
12347
msgid ""
12348
"Called when the smart client is submitting a request to the smart\n"
12349
"server. Called with a bzrlib.smart.client.CallHookParams object.\n"
12350
"Streaming request bodies, and responses, are not accessible."
12351
msgstr ""
12352
12353
#: en/help_topics/hooks.txt:437
12354
msgid ""
12355
"SmartServerHooks\n"
12356
"----------------"
12357
msgstr ""
12358
12359
#: en/help_topics/hooks.txt:440
12360
msgid ""
12361
"server_exception\n"
12362
"~~~~~~~~~~~~~~~~"
12363
msgstr ""
12364
12365
#: en/help_topics/hooks.txt:445
12366
msgid ""
12367
"Called by the bzr server when an exception occurs. server_exception is\n"
12368
"called with the sys.exc_info() tuple return true for the hook if the\n"
12369
"exception has been handled, in which case the server will exit\n"
12370
"normally."
12371
msgstr ""
12372
12373
#: en/help_topics/hooks.txt:450
12374
msgid ""
12375
"server_started\n"
12376
"~~~~~~~~~~~~~~"
12377
msgstr ""
12378
12379
#: en/help_topics/hooks.txt:453 en/help_topics/hooks.txt:472
12380
msgid "Introduced in: 0.16"
12381
msgstr ""
12382
12383
#: en/help_topics/hooks.txt:455
12384
msgid ""
12385
"Called by the bzr server when it starts serving a directory.\n"
12386
"server_started is called with (backing urls, public url), where\n"
12387
"backing_url is a list of URLs giving the server-specific directory\n"
12388
"locations, and public_url is the public URL for the directory being\n"
12389
"served."
12390
msgstr ""
12391
12392
#: en/help_topics/hooks.txt:461
12393
msgid ""
12394
"server_started_ex\n"
12395
"~~~~~~~~~~~~~~~~~"
12396
msgstr ""
12397
12398
#: en/help_topics/hooks.txt:466
12399
msgid ""
12400
"Called by the bzr server when it starts serving a directory.\n"
12401
"server_started is called with (backing_urls, server_obj)."
12402
msgstr ""
12403
12404
#: en/help_topics/hooks.txt:469
12405
msgid ""
12406
"server_stopped\n"
12407
"~~~~~~~~~~~~~~"
12408
msgstr ""
12409
12410
#: en/help_topics/hooks.txt:474
12411
msgid ""
12412
"Called by the bzr server when it stops serving a directory.\n"
12413
"server_stopped is called with the same parameters as the\n"
12414
"server_started hook: (backing_urls, public_url)."
12415
msgstr ""
12416
12417
#: en/help_topics/hooks.txt:478
12418
msgid ""
12419
"StatusHooks\n"
12420
"-----------"
12421
msgstr ""
12422
12423
#: en/help_topics/hooks.txt:481
12424
msgid ""
12425
"post_status\n"
12426
"~~~~~~~~~~~"
12427
msgstr ""
12428
12429
#: en/help_topics/hooks.txt:484 en/help_topics/hooks.txt:495
12430
msgid "Introduced in: 2.3"
12431
msgstr ""
12432
12433
#: en/help_topics/hooks.txt:486
12434
msgid ""
12435
"Called with argument StatusHookParams after Bazaar has displayed the\n"
12436
"status. StatusHookParams has the attributes (old_tree, new_tree,\n"
12437
"to_file, versioned, show_ids, short, verbose). The last four arguments\n"
12438
"correspond to the command line options specified by the user for the\n"
12439
"status command. to_file is the output stream for writing."
12440
msgstr ""
12441
12442
#: en/help_topics/hooks.txt:492
12443
msgid ""
12444
"pre_status\n"
12445
"~~~~~~~~~~"
12446
msgstr ""
12447
12448
#: en/help_topics/hooks.txt:497
12449
msgid ""
12450
"Called with argument StatusHookParams before Bazaar displays the\n"
12451
"status. StatusHookParams has the attributes (old_tree, new_tree,\n"
12452
"to_file, versioned, show_ids, short, verbose). The last four arguments\n"
12453
"correspond to the command line options specified by the user for the\n"
12454
"status command. to_file is the output stream for writing."
12455
msgstr ""
12456
12457
#: en/help_topics/hooks.txt:503
12458
msgid ""
12459
"TransportHooks\n"
12460
"--------------"
12461
msgstr ""
12462
12463
#: en/help_topics/hooks.txt:506
12464
msgid ""
12465
"post_connect\n"
12466
"~~~~~~~~~~~~"
12467
msgstr ""
12468
12469
#: en/help_topics/hooks.txt:511
12470
msgid ""
12471
"Called after a new connection is established or a reconnect occurs.\n"
12472
"The sole argument passed is either the connected transport or smart\n"
12473
"medium instance."
12474
msgstr ""
12475
12476
#: en/help_topics/hooks.txt:515
12477
msgid ""
12478
"RioVersionInfoBuilderHooks\n"
12479
"--------------------------"
12480
msgstr ""
12481
12482
#: en/help_topics/hooks.txt:518
12483
msgid ""
12484
"revision\n"
12485
"~~~~~~~~"
12486
msgstr ""
12487
12488
#: en/help_topics/hooks.txt:523
12489
msgid ""
12490
"Invoked when adding information about a revision to the RIO stanza\n"
12491
"that is printed. revision is called with a revision object and a RIO\n"
12492
"stanza.\n"
12493
msgstr ""
12494
12495
#: en/help_topics/location-alias.txt:1
12496
msgid ""
12497
"Location aliases\n"
12498
"================"
12499
msgstr ""
12500
12501
#: en/help_topics/location-alias.txt:4
12502
msgid ""
12503
"Bazaar defines several aliases for locations associated with a branch. "
12504
"These\n"
12505
"can be used with most commands that expect a location, such as `bzr push`."
12506
msgstr ""
12507
12508
#: en/help_topics/location-alias.txt:7
12509
msgid "The aliases are::"
12510
msgstr ""
12511
12512
#: en/help_topics/location-alias.txt:9
12513
msgid ""
12514
" :bound The branch this branch is bound to, for bound branches.\n"
12515
" :parent The parent of this branch.\n"
12516
" :public The public location of this branch.\n"
12517
" :push The saved location used for `bzr push` with no arguments.\n"
12518
" :submit The submit branch for this branch.\n"
12519
" :this This branch."
12520
msgstr ""
12521
12522
#: en/help_topics/location-alias.txt:16
12523
msgid "For example, to push to the parent location::"
12524
msgstr ""
12525
12526
#: en/help_topics/location-alias.txt:18
12527
msgid " bzr push :parent\n"
12528
msgstr ""
12529
12530
#: en/help_topics/log-formats.txt:1
12531
msgid ""
12532
"Log Formats\n"
12533
"==========="
12534
msgstr ""
12535
12536
#: en/help_topics/log-formats.txt:4
12537
msgid ""
12538
"A log format controls how information about each revision is displayed.\n"
12539
"The standard log formats are compared below::"
12540
msgstr ""
12541
12542
#: en/help_topics/log-formats.txt:7
12543
msgid ""
12544
" Feature long short line\n"
12545
" ---------------------- ------------- ------------ -------------------\n"
12546
" design goal detailed view concise view 1 revision per line\n"
12547
" committer name+email name only name only\n"
12548
" author name+email - -\n"
12549
" date-time format full date only date only\n"
12550
" commit message full full top line\n"
12551
" tags yes yes yes\n"
12552
" merges indicator - yes -\n"
12553
" status/delta optional optional -\n"
12554
" diff/patch optional optional -\n"
12555
" revision-id optional optional -\n"
12556
" branch nick yes - -\n"
12557
" foreign vcs properties yes yes -\n"
12558
" preferred levels all 1 1\n"
12559
" digital signature optional - -"
12560
msgstr ""
12561
12562
#: en/help_topics/log-formats.txt:24
12563
msgid ""
12564
"The default format is ``long``. To change this, define the ``log_format``\n"
12565
"setting in the ``[DEFAULT]`` section of ``bazaar.conf`` like this (say)::"
12566
msgstr ""
12567
12568
#: en/help_topics/log-formats.txt:27
12569
msgid ""
12570
" [DEFAULT]\n"
12571
" log_format = short"
12572
msgstr ""
12573
12574
#: en/help_topics/log-formats.txt:30
12575
msgid ""
12576
"Alternatively, to change the log format used for a given query, use the\n"
12577
"--long, --short or --line options."
12578
msgstr ""
12579
12580
#: en/help_topics/log-formats.txt:33
12581
msgid ""
12582
"If one of the standard log formats does not meet your needs, additional\n"
12583
"formats can be provided by plugins.\n"
12584
msgstr ""
12585
12586
#: en/help_topics/other-formats.txt:1
12587
msgid "Other Storage Formats"
12588
msgstr ""
12589
12590
#: en/help_topics/other-formats.txt:3
12591
msgid "Experimental formats are shown below."
12592
msgstr ""
12593
12594
#: en/help_topics/other-formats.txt:5
12595
msgid ""
12596
":development-colo:\n"
12597
" (native) The 2a format with experimental support for colocated\n"
12598
" branches."
12599
msgstr ""
12600
12601
#: en/help_topics/other-formats.txt:9
12602
msgid ""
12603
"\n"
12604
"Deprecated formats are shown below."
12605
msgstr ""
12606
12607
#: en/help_topics/other-formats.txt:12
12608
msgid ""
12609
":pack-0.92:\n"
12610
" (native) Pack-based format used in 1.x series. Introduced in 0.92.\n"
12611
" Interoperates with bzr repositories before 0.92 but cannot be read\n"
12612
" by bzr < 0.92."
12613
msgstr ""
12614
12615
#: en/help_topics/patterns.txt:1
12616
msgid ""
12617
"Patterns\n"
12618
"========"
12619
msgstr ""
12620
12621
#: en/help_topics/patterns.txt:4
12622
msgid ""
12623
"Bazaar uses patterns to match files at various times. For example,\n"
12624
"the ``add`` command skips over files that match ignore patterns\n"
12625
"and preferences can be associated with files using rule patterns.\n"
12626
"The pattern syntax is described below."
12627
msgstr ""
12628
12629
#: en/help_topics/patterns.txt:9
12630
msgid ""
12631
"Trailing slashes on patterns are ignored. If the pattern contains a\n"
12632
"slash or is a regular expression, it is compared to the whole path\n"
12633
"from the branch root. Otherwise, it is compared to only the last\n"
12634
"component of the path. To match a file only in the root directory,\n"
12635
"prepend ``./``. Patterns specifying absolute paths are not allowed."
12636
msgstr ""
12637
12638
#: en/help_topics/patterns.txt:15
12639
msgid "Patterns may include globbing wildcards such as::"
12640
msgstr ""
12641
12642
#: en/help_topics/patterns.txt:17
12643
msgid ""
12644
" ? - Matches any single character except '/'\n"
12645
" * - Matches 0 or more characters except '/'\n"
12646
" /**/ - Matches 0 or more directories in a path\n"
12647
" [a-z] - Matches a single character from within a group of characters"
12648
msgstr ""
12649
12650
#: en/help_topics/patterns.txt:22
12651
msgid ""
12652
"Patterns may also be `Python regular expressions`_. Regular expression\n"
12653
"patterns are identified by a ``RE:`` prefix followed by the regular\n"
12654
"expression. Regular expression patterns may not include named or\n"
12655
"numbered groups."
12656
msgstr ""
12657
12658
#: en/help_topics/patterns.txt:27
12659
msgid ""
12660
"Case insensitive ignore patterns can be specified with regular expressions\n"
12661
"by using the ``i`` (for ignore case) flag in the pattern."
12662
msgstr ""
12663
12664
#: en/help_topics/patterns.txt:30
12665
msgid ""
12666
"For example, a case insensitive match for ``foo`` may be specified as::"
12667
msgstr ""
12668
12669
#: en/help_topics/patterns.txt:32
12670
msgid " RE:(?i)foo"
12671
msgstr ""
12672
12673
#: en/help_topics/patterns.txt:34
12674
msgid ""
12675
"Ignore patterns may be prefixed with ``!``, which means that a filename\n"
12676
"matched by that pattern will not be ignored."
12677
msgstr ""
12678
12679
#: en/help_topics/patterns.txt:37
12680
msgid ""
12681
".. _Python regular expressions: http://docs.python.org/library/re.html"
12682
msgstr ""
12683
12684
#: en/help_topics/revisionspec.txt:1
12685
msgid "Revision Identifiers"
12686
msgstr ""
12687
12688
#: en/help_topics/revisionspec.txt:3
12689
msgid ""
12690
"A revision identifier refers to a specific state of a branch's history. It\n"
12691
"can be expressed in several ways. It can begin with a keyword to\n"
12692
"unambiguously specify a given lookup type; some examples are 'last:1',\n"
12693
"'before:yesterday' and 'submit:'."
12694
msgstr ""
12695
12696
#: en/help_topics/revisionspec.txt:8
12697
msgid ""
12698
"Alternately, it can be given without a keyword, in which case it will be\n"
12699
"checked as a revision number, a tag, a revision id, a date specification, or "
12700
"a\n"
12701
"branch specification, in that order. For example, 'date:today' could be\n"
12702
"written as simply 'today', though if you have a tag called 'today' that "
12703
"will\n"
12704
"be found first."
12705
msgstr ""
12706
12707
#: en/help_topics/revisionspec.txt:14
12708
msgid ""
12709
"If 'REV1' and 'REV2' are revision identifiers, then 'REV1..REV2' denotes a\n"
12710
"revision range. Examples: '3647..3649', 'date:yesterday..-1' and\n"
12711
"'branch:/path/to/branch1/..branch:/branch2' (note that there are no quotes "
12712
"or\n"
12713
"spaces around the '..')."
12714
msgstr ""
12715
12716
#: en/help_topics/revisionspec.txt:19
12717
msgid ""
12718
"Ranges are interpreted differently by different commands. To the \"log\" "
12719
"command,\n"
12720
"a range is a sequence of log messages, but to the \"diff\" command, the "
12721
"range\n"
12722
"denotes a change between revisions (and not a sequence of changes). In\n"
12723
"addition, \"log\" considers a closed range whereas \"diff\" and \"merge\" "
12724
"consider it\n"
12725
"to be open-ended, that is, they include one end but not the other. For "
12726
"example:\n"
12727
"\"bzr log -r 3647..3649\" shows the messages of revisions 3647, 3648 and "
12728
"3649,\n"
12729
"while \"bzr diff -r 3647..3649\" includes the changes done in revisions 3648 "
12730
"and\n"
12731
"3649, but not 3647."
12732
msgstr ""
12733
12734
#: en/help_topics/revisionspec.txt:28
12735
msgid "The keywords used as revision selection methods are the following:"
12736
msgstr ""
12737
12738
#: en/help_topics/revisionspec.txt:30
12739
msgid ""
12740
":revid:\n"
12741
"\tSelects a revision using the revision id.\n"
12742
":submit:\n"
12743
"\tSelects a common ancestor with the submit branch.\n"
12744
":ancestor:\n"
12745
"\tSelects a common ancestor with a second branch.\n"
12746
":date:\n"
12747
"\tSelects a revision on the basis of a datestamp.\n"
12748
":branch:\n"
12749
"\tSelects the last revision of a specified branch.\n"
12750
":tag:\n"
12751
"\tSelects a revision identified by a tag name.\n"
12752
":revno:\n"
12753
"\tSelects a revision using a number.\n"
12754
":before:\n"
12755
"\tSelects the parent of the revision specified.\n"
12756
":annotate:\n"
12757
"\tSelect the revision that last modified the specified line.\n"
12758
":mainline:\n"
12759
"\tSelect mainline revision that merged the specified revision.\n"
12760
":last:\n"
12761
"\tSelects the nth revision from the end."
12762
msgstr ""
12763
12764
#: en/help_topics/revisionspec.txt:53
12765
msgid "In addition, plugins can provide other keywords."
12766
msgstr ""
12767
12768
#: en/help_topics/revisionspec.txt:55
12769
msgid "A detailed description of each keyword is given below."
12770
msgstr ""
12771
12772
#: en/help_topics/revisionspec.txt:57
12773
msgid ":revid:"
12774
msgstr ""
12775
12776
#: en/help_topics/revisionspec.txt:59
12777
msgid ""
12778
" Supply a specific revision id, that can be used to specify any\n"
12779
" revision id in the ancestry of the branch.\n"
12780
" Including merges, and pending merges.\n"
12781
" Examples::"
12782
msgstr ""
12783
12784
#: en/help_topics/revisionspec.txt:64
12785
msgid ""
12786
" revid:aaaa@bbbb-123456789 -> Select revision 'aaaa@bbbb-123456789'"
12787
msgstr ""
12788
12789
#: en/help_topics/revisionspec.txt:66
12790
msgid ":submit:"
12791
msgstr ""
12792
12793
#: en/help_topics/revisionspec.txt:68
12794
msgid ""
12795
" Diffing against this shows all the changes that were made in this "
12796
"branch,\n"
12797
" and is a good predictor of what merge will do. The submit branch is\n"
12798
" used by the bundle and merge directive commands. If no submit branch\n"
12799
" is specified, the parent branch is used instead."
12800
msgstr ""
12801
12802
#: en/help_topics/revisionspec.txt:73 en/help_topics/revisionspec.txt:85
12803
msgid ""
12804
" The common ancestor is the last revision that existed in both\n"
12805
" branches. Usually this is the branch point, but it could also be\n"
12806
" a revision that was merged."
12807
msgstr ""
12808
12809
#: en/help_topics/revisionspec.txt:77 en/help_topics/revisionspec.txt:93
12810
#: en/help_topics/revisionspec.txt:109 en/help_topics/revisionspec.txt:119
12811
#: en/help_topics/revisionspec.txt:153
12812
msgid " Examples::"
12813
msgstr ""
12814
12815
#: en/help_topics/revisionspec.txt:79
12816
msgid " $ bzr diff -r submit:"
12817
msgstr ""
12818
12819
#: en/help_topics/revisionspec.txt:81
12820
msgid ":ancestor:"
12821
msgstr ""
12822
12823
#: en/help_topics/revisionspec.txt:83
12824
msgid " Supply the path to a branch to select the common ancestor."
12825
msgstr ""
12826
12827
#: en/help_topics/revisionspec.txt:89
12828
msgid ""
12829
" This is frequently used with 'diff' to return all of the changes\n"
12830
" that your branch introduces, while excluding the changes that you\n"
12831
" have not merged from the remote branch."
12832
msgstr ""
12833
12834
#: en/help_topics/revisionspec.txt:95
12835
msgid ""
12836
" ancestor:/path/to/branch\n"
12837
" $ bzr diff -r ancestor:../../mainline/branch"
12838
msgstr ""
12839
12840
#: en/help_topics/revisionspec.txt:98
12841
msgid ":date:"
12842
msgstr ""
12843
12844
#: en/help_topics/revisionspec.txt:100
12845
msgid ""
12846
" Supply a datestamp to select the first revision that matches the date.\n"
12847
" Date can be 'yesterday', 'today', 'tomorrow' or a YYYY-MM-DD string.\n"
12848
" Matches the first entry after a given date (either at midnight or\n"
12849
" at a specified time)."
12850
msgstr ""
12851
12852
#: en/help_topics/revisionspec.txt:105
12853
msgid " One way to display all the changes since yesterday would be::"
12854
msgstr ""
12855
12856
#: en/help_topics/revisionspec.txt:107
12857
msgid " bzr log -r date:yesterday.."
12858
msgstr ""
12859
12860
#: en/help_topics/revisionspec.txt:111
12861
msgid ""
12862
" date:yesterday -> select the first revision since "
12863
"yesterday\n"
12864
" date:2006-08-14,17:10:14 -> select the first revision after\n"
12865
" August 14th, 2006 at 5:10pm."
12866
msgstr ""
12867
12868
#: en/help_topics/revisionspec.txt:115
12869
msgid ":branch:"
12870
msgstr ""
12871
12872
#: en/help_topics/revisionspec.txt:117
12873
msgid " Supply the path to a branch to select its last revision."
12874
msgstr ""
12875
12876
#: en/help_topics/revisionspec.txt:121
12877
msgid " branch:/path/to/branch"
12878
msgstr ""
12879
12880
#: en/help_topics/revisionspec.txt:123
12881
msgid ":tag:"
12882
msgstr ""
12883
12884
#: en/help_topics/revisionspec.txt:125
12885
msgid " Tags are stored in the branch and created by the 'tag' command."
12886
msgstr ""
12887
12888
#: en/help_topics/revisionspec.txt:127
12889
msgid ":revno:"
12890
msgstr ""
12891
12892
#: en/help_topics/revisionspec.txt:129
12893
msgid ""
12894
" Use an integer to specify a revision in the history of the branch.\n"
12895
" Optionally a branch can be specified. A negative number will count\n"
12896
" from the end of the branch (-1 is the last revision, -2 the previous\n"
12897
" one). If the negative number is larger than the branch's history, the\n"
12898
" first revision is returned.\n"
12899
" Examples::"
12900
msgstr ""
12901
12902
#: en/help_topics/revisionspec.txt:136
12903
msgid ""
12904
" revno:1 -> return the first revision of this branch\n"
12905
" revno:3:/path/to/branch -> return the 3rd revision of\n"
12906
" the branch '/path/to/branch'\n"
12907
" revno:-1 -> The last revision in a branch.\n"
12908
" -2:http://other/branch -> The second to last revision in the\n"
12909
" remote branch.\n"
12910
" -1000000 -> Most likely the first revision, unless\n"
12911
" your history is very long."
12912
msgstr ""
12913
12914
#: en/help_topics/revisionspec.txt:145
12915
msgid ":before:"
12916
msgstr ""
12917
12918
#: en/help_topics/revisionspec.txt:147
12919
msgid ""
12920
" Supply any revision spec to return the parent of that revision. This "
12921
"is\n"
12922
" mostly useful when inspecting revisions that are not in the revision "
12923
"history\n"
12924
" of a branch."
12925
msgstr ""
12926
12927
#: en/help_topics/revisionspec.txt:151
12928
msgid ""
12929
" It is an error to request the parent of the null revision (before:0)."
12930
msgstr ""
12931
12932
#: en/help_topics/revisionspec.txt:155
12933
msgid ""
12934
" before:1913 -> Return the parent of revno 1913 (revno 1912)\n"
12935
" before:revid:aaaa@bbbb-1234567890 -> return the parent of revision\n"
12936
" aaaa@bbbb-1234567890\n"
12937
" bzr diff -r before:1913..1913\n"
12938
" -> Find the changes between revision 1913 and its parent "
12939
"(1912).\n"
12940
" (What changes did revision 1913 introduce).\n"
12941
" This is equivalent to: bzr diff -c 1913"
12942
msgstr ""
12943
12944
#: en/help_topics/revisionspec.txt:163
12945
msgid ":annotate:"
12946
msgstr ""
12947
12948
#: en/help_topics/revisionspec.txt:165
12949
msgid ""
12950
" Select the revision that last modified the specified line. Line is\n"
12951
" specified as path:number. Path is a relative path to the file. "
12952
"Numbers\n"
12953
" start at 1, and are relative to the current version, not the last-\n"
12954
" committed version of the file."
12955
msgstr ""
12956
12957
#: en/help_topics/revisionspec.txt:170
12958
msgid ":mainline:"
12959
msgstr ""
12960
12961
#: en/help_topics/revisionspec.txt:172
12962
msgid ""
12963
" Select the revision that merged the specified revision into mainline."
12964
msgstr ""
12965
12966
#: en/help_topics/revisionspec.txt:174
12967
msgid ":last:"
12968
msgstr ""
12969
12970
#: en/help_topics/revisionspec.txt:176
12971
msgid ""
12972
" Supply a positive number to get the nth revision from the end.\n"
12973
" This is the same as supplying negative numbers to the 'revno:' spec.\n"
12974
" Examples::"
12975
msgstr ""
12976
12977
#: en/help_topics/revisionspec.txt:180
12978
msgid ""
12979
" last:1 -> return the last revision\n"
12980
" last:3 -> return the revision 2 before the end.\n"
12981
msgstr ""
12982
12983
#: en/help_topics/rules.txt:1
12984
msgid ""
12985
"Rules\n"
12986
"====="
12987
msgstr ""
12988
12989
#: en/help_topics/rules.txt:7
12990
msgid ""
12991
"Rules are defined in ini file format where the sections are file glob\n"
12992
"patterns and the contents of each section are the preferences for files\n"
12993
"matching that pattern(s). For example::"
12994
msgstr ""
12995
12996
#: en/help_topics/rules.txt:11
12997
msgid ""
12998
" [name *.bat]\n"
12999
" eol = native"
13000
msgstr ""
13001
13002
#: en/help_topics/rules.txt:14
13003
msgid ""
13004
" [name *.html *.xml]\n"
13005
" keywords = xml_escape"
13006
msgstr ""
13007
13008
#: en/help_topics/rules.txt:17
13009
msgid ""
13010
"Preferences like these are useful for commands and plugins wishing to\n"
13011
"provide custom behaviour for selected files. For more information on \n"
13012
"end of line conversion see :doc:`eol-help`.\n"
13013
"Keyword support is provided by the `keywords plugin\n"
13014
"<http://doc.bazaar.canonical.com/plugins/en/keywords-plugin.html>`_."
13015
msgstr ""
13016
13017
#: en/help_topics/rules.txt:23
13018
msgid ""
13019
"Files\n"
13020
"-----"
13021
msgstr ""
13022
13023
#: en/help_topics/rules.txt:26
13024
msgid ""
13025
"Default rules for all branches are defined in the optional file\n"
13026
"``BZR_HOME/rules``. "
13027
msgstr ""
13028
13029
#: en/help_topics/rules.txt:29
13030
msgid ""
13031
"Rule Patterns\n"
13032
"-------------"
13033
msgstr ""
13034
13035
#: en/help_topics/rules.txt:32
13036
msgid ""
13037
"Patterns are ordered and searching stops as soon as one matches.\n"
13038
"As a consequence, more explicit patterns should be placed towards\n"
13039
"the top of the file. Rule patterns use exactly the same conventions\n"
13040
"as ignore patterns. See :doc:`patterns-help` for details."
13041
msgstr ""
13042
13043
#: en/help_topics/rules.txt:37
13044
msgid ".. note::"
13045
msgstr ""
13046
13047
#: en/help_topics/rules.txt:39
13048
msgid ""
13049
" Patterns containing square brackets or spaces should be\n"
13050
" surrounded in quotes to ensure they are correctly parsed.\n"
13051
msgstr ""
13052
13053
#: en/help_topics/topics.txt:1
13054
msgid ""
13055
"authentication Information on configuring authentication\n"
13056
"basic Basic commands\n"
13057
"branches Information on what a branch is\n"
13058
"bugs Bug tracker settings\n"
13059
"checkouts Information on what a checkout is\n"
13060
"commands Basic help for all commands\n"
13061
"configuration Details on the configuration settings available\n"
13062
"conflict-types Types of conflicts and what to do about them\n"
13063
"content-filters Conversion of content into/from working trees\n"
13064
"criss-cross Information on criss-cross merging\n"
13065
"current-formats Current storage formats\n"
13066
"debug-flags Options to show or record debug information\n"
13067
"diverged-branches How to fix diverged branches\n"
13068
"env-variables Environment variable names and values\n"
13069
"eol Information on end-of-line handling\n"
13070
"files Information on configuration and log files\n"
13071
"formats Information on choosing a storage format\n"
13072
"global-options Options that control how Bazaar runs\n"
13073
"hidden-commands All hidden commands\n"
13074
"hooks Points at which custom processing can be added\n"
13075
"launchpad Using Bazaar with Launchpad.net\n"
13076
"location-alias Aliases for remembered locations\n"
13077
"log-formats Details on the logging formats available\n"
13078
"other-formats Experimental and deprecated storage formats\n"
13079
"patterns Information on the pattern syntax\n"
13080
"repositories Basic information on shared repositories.\n"
13081
"revisionspec Explain how to use --revision\n"
13082
"rules Information on defining rule-based preferences\n"
13083
"standalone-trees Information on what a standalone tree is\n"
13084
"standard-options Options that can be used with any command\n"
13085
"status-flags Help on status flags\n"
13086
"sync-for-reconfigure Steps to resolve \"out-of-sync\" when reconfiguring\n"
13087
"topics Topics list\n"
13088
"url-special-chars Special character handling in URLs\n"
13089
"urlspec Supported transport protocols\n"
13090
"working-trees Information on working trees\n"
13091
msgstr ""
13092
13093
#: en/help_topics/url-special-chars.txt:1
13094
msgid ""
13095
"Special character handling in URLs\n"
13096
"=================================="
13097
msgstr ""
13098
13099
#: en/help_topics/url-special-chars.txt:4
13100
msgid "Bazaar allows locations to be specified in multiple ways, either:"
13101
msgstr ""
13102
13103
#: en/help_topics/url-special-chars.txt:6
13104
msgid " * Fully qualified URLs"
13105
msgstr ""
13106
13107
#: en/help_topics/url-special-chars.txt:8
13108
msgid " * File system paths, relative or absolute"
13109
msgstr ""
13110
13111
#: en/help_topics/url-special-chars.txt:10
13112
msgid ""
13113
"Internally bzr treats all locations as URLs. For any file system paths\n"
13114
"that are specified it will automatically determine the appropriate URL\n"
13115
"representation, and escape special characters where necessary."
13116
msgstr ""
13117
13118
#: en/help_topics/url-special-chars.txt:14
13119
msgid ""
13120
"There are a few characters which have special meaning in URLs and need "
13121
"careful\n"
13122
"handling to avoid ambiguities. Characters can be escaped with a % and a hex\n"
13123
"value in URLs. Any non-ASCII characters in a file path will automatically "
13124
"be\n"
13125
"urlencoded when the path is converted to a URL."
13126
msgstr ""
13127
13128
#: en/help_topics/url-special-chars.txt:19
13129
msgid ""
13130
"URLs represent non-ASCII characters in an encoding defined by the server, "
13131
"but\n"
13132
"usually UTF-8. The % escapes should be of the UTF-8 bytes. Bazaar tries to "
13133
"be\n"
13134
"generous in what it accepts as a URL and to print them in a way that\n"
13135
"will be readable."
13136
msgstr ""
13137
13138
#: en/help_topics/url-special-chars.txt:24
13139
msgid ""
13140
"For example, if you have a directory named '/tmp/%2False' these are all "
13141
"valid\n"
13142
"ways of accessing the content (0x2F, or 47, is the ASCII code for forward "
13143
"slash)::"
13144
msgstr ""
13145
13146
#: en/help_topics/url-special-chars.txt:27
13147
msgid ""
13148
" cd /tmp\n"
13149
" bzr log /tmp/%2False\n"
13150
" bzr log %2False\n"
13151
" bzr log file:///tmp/%252False\n"
13152
" bzr log file://localhost/tmp/%252False\n"
13153
" bzr log file:%252False"
13154
msgstr ""
13155
13156
#: en/help_topics/url-special-chars.txt:34
13157
msgid "These are valid but do not refer to the same file::"
13158
msgstr ""
13159
13160
#: en/help_topics/url-special-chars.txt:36
13161
msgid ""
13162
" bzr log file:///tmp/%2False (refers to a file called /tmp/\\/alse)\n"
13163
" bzr log %252False (refers to a file called /tmp/%252False)"
13164
msgstr ""
13165
13166
#: en/help_topics/url-special-chars.txt:39
13167
msgid ""
13168
"Comma also has special meaning in URLs, because it denotes `segment "
13169
"parameters`_"
13170
msgstr ""
13171
13172
#: en/help_topics/url-special-chars.txt:41
13173
msgid ""
13174
"_`segment parameters`: http://www.ietf.org/rfc/rfc3986.txt (section 3.3)"
13175
msgstr ""
13176
13177
#: en/help_topics/url-special-chars.txt:43
13178
msgid ""
13179
"Comma is also special in any file system paths that are specified. To use a "
13180
"literal\n"
13181
"comma in a file system path, specify a URL and URL encode the comma::"
13182
msgstr ""
13183
13184
#: en/help_topics/url-special-chars.txt:46
13185
msgid ""
13186
" bzr log foo,branch=bla # path \"foo\" with the segment parameter "
13187
"\"branch\" set to \"bla\"\n"
13188
" bzr log file:foo%2Cbranch=bla # path \"foo,branch=bla\"\n"
13189
" bzr log file:foo,branch=bla # path \"foo\" with segment parameter "
13190
"\"branch\" set to \"bla\"\n"
13191
msgstr ""
13192
13193
#: en/help_topics/urlspec.txt:1
13194
msgid "URL Identifiers"
13195
msgstr ""
13196
13197
#: en/help_topics/urlspec.txt:3
13198
msgid "Supported URL prefixes::"
13199
msgstr ""
13200
13201
#: en/help_topics/urlspec.txt:5
13202
msgid ""
13203
" aftp:// Access using active FTP.\n"
13204
" bzr:// Fast access using the Bazaar smart server.\n"
13205
" bzr+ssh:// Fast access using the Bazaar smart server over SSH.\n"
13206
" file:// Access using the standard filesystem (default)\n"
13207
" ftp:// Access using passive FTP.\n"
13208
" http:// Read-only access of branches exported on the web.\n"
13209
" https:// Read-only access of branches exported on the web using "
13210
"SSL.\n"
13211
" sftp:// Access using SFTP (most SSH servers provide SFTP)."
13212
msgstr ""
13213
13214
#: en/help_topics/urlspec.txt:14
13215
msgid "Supported modifiers::"
13216
msgstr ""
13217
13218
#: en/help_topics/urlspec.txt:16
13219
msgid " gio+ Access using any GIO supported protocols."
13220
msgstr ""
13221
13222
#: en/help_topics/urlspec.txt:18
13223
msgid "Bazaar supports all of the standard parts within the URL::"
13224
msgstr ""
13225
13226
#: en/help_topics/urlspec.txt:20
13227
msgid " <protocol>://[user[:password]@]host[:port]/[path]"
13228
msgstr ""
13229
13230
#: en/help_topics/urlspec.txt:22
13231
msgid "allowing URLs such as::"
13232
msgstr ""
13233
13234
#: en/help_topics/urlspec.txt:24
13235
msgid " http://bzruser:BadPass@bzr.example.com:8080/bzr/trunk"
13236
msgstr ""
13237
13238
#: en/help_topics/urlspec.txt:26
13239
msgid ""
13240
"For bzr+ssh:// and sftp:// URLs, Bazaar also supports paths that begin\n"
13241
"with '~' as meaning that the rest of the path should be interpreted\n"
13242
"relative to the remote user's home directory. For example if the user\n"
13243
"``remote`` has a home directory of ``/home/remote`` on the server\n"
13244
"shell.example.com, then::"
13245
msgstr ""
13246
13247
#: en/help_topics/urlspec.txt:32
13248
msgid " bzr+ssh://remote@shell.example.com/~/myproject/trunk"
13249
msgstr ""
13250
13251
#: en/help_topics/urlspec.txt:34
13252
msgid "would refer to ``/home/remote/myproject/trunk``."
13253
msgstr ""
13254
13255
#: en/help_topics/urlspec.txt:36
13256
msgid ""
13257
"Many commands that accept URLs also accept location aliases too.\n"
13258
"See :doc:`location-alias-help` and :doc:`url-special-chars-help`.\n"
13259
msgstr ""
Loggerhead is a web-based interface for Breezy
Version: 2.0.1