1
# Greek 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.
8
"Project-Id-Version: bzr\n"
9
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10
"POT-Creation-Date: 2013-07-27 12:45+0200\n"
11
"PO-Revision-Date: 2012-07-03 04:41+0000\n"
12
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
13
"Language-Team: Greek <el@li.org>\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: 2015-10-08 10:47+0000\n"
19
"X-Generator: Launchpad (build 17802)\n"
22
msgid "skipping {0} (larger than {1} of {2} bytes)"
25
#: bzrlib/branch.py:872
29
#: bzrlib/branch.py:3012
31
msgid "Pushed up to revision %d."
34
#: bzrlib/branch.py:3014
36
msgid "%d tag updated."
37
msgid_plural "%d tags updated."
41
#: bzrlib/branch.py:3017
42
msgid "No new revisions or tags to push."
45
#: bzrlib/branch.py:3019
46
msgid "No new revisions to push."
49
#: bzrlib/branch.py:3039
50
msgid "checked branch {0} format {1}"
53
#: bzrlib/branch.py:3042
55
msgid "found error:%s"
58
#: bzrlib/builtins.py:251 bzrlib/builtins.py:3043 bzrlib/workingtree.py:324
60
msgid "Ignoring files outside view. View is %s"
63
#: bzrlib/builtins.py:260
65
msgid "bzr %s --revision takes exactly one revision identifier"
68
#: bzrlib/builtins.py:315
69
msgid "Display status summary."
72
#: bzrlib/builtins.py:317
74
"This reports on versioned and unknown files, reporting them\n"
75
"grouped by state. Possible states are:"
78
#: bzrlib/builtins.py:320
81
" Versioned in the working copy but not in the previous revision."
84
#: bzrlib/builtins.py:323
87
" Versioned in the previous revision but removed or deleted\n"
88
" in the working copy."
91
#: bzrlib/builtins.py:327
94
" Path of this file changed from the previous revision;\n"
95
" the text may also have changed. This includes files whose\n"
96
" parent directory was renamed."
99
#: bzrlib/builtins.py:332
102
" Text has changed since the previous revision."
105
#: bzrlib/builtins.py:335
108
" File kind has been changed (e.g. from file to directory)."
111
#: bzrlib/builtins.py:338
114
" Not versioned and not matching an ignore pattern."
117
#: bzrlib/builtins.py:341
119
"Additionally for directories, symlinks and files with a changed\n"
120
"executable bit, Bazaar indicates their type using a trailing\n"
121
"character: '/', '@' or '*' respectively. These decorations can be\n"
122
"disabled using the '--no-classify' option."
125
#: bzrlib/builtins.py:346
127
"To see ignored files use 'bzr ignored'. For details on the\n"
128
"changes to file texts, use 'bzr diff'."
131
#: bzrlib/builtins.py:349
133
"Note that --short or -S gives status flags for each item, similar\n"
134
"to Subversion's status command. To get output similar to svn -q,\n"
135
"use bzr status -SV."
138
#: bzrlib/builtins.py:353
140
"If no arguments are specified, the status of the entire working\n"
141
"directory is shown. Otherwise, only the status of the specified\n"
142
"files or directories is reported. If a directory is given, status\n"
143
"is reported for everything inside that directory."
146
#: bzrlib/builtins.py:358
148
"Before merges are committed, the pending merge tip revisions are\n"
149
"shown. To see all pending merge revisions, use the -v option.\n"
150
"To skip the display of pending merge information altogether, use\n"
151
"the no-pending option or specify a file/directory."
154
#: bzrlib/builtins.py:363
156
"To compare the working directory to a specific revision, pass a\n"
157
"single revision to the revision argument."
160
#: bzrlib/builtins.py:366
162
"To see which files have changed in a specific revision, or between\n"
163
"two revisions, pass a revision range to the revision argument.\n"
164
"This will produce the same results as calling 'bzr diff --summarize'."
167
#: bzrlib/builtins.py:375
168
msgid "Use short status indicators."
171
#: bzrlib/builtins.py:377
172
msgid "Only show versioned files."
175
#: bzrlib/builtins.py:379
176
msgid "Don't show pending merges."
179
#: bzrlib/builtins.py:382
180
msgid "Do not mark object type using indicator."
183
#: bzrlib/builtins.py:397
184
msgid "bzr status --revision takes exactly one or two revision specifiers"
187
#: bzrlib/builtins.py:441 bzrlib/builtins.py:5229
188
msgid "You can only supply one of revision_id or --revision"
191
#: bzrlib/builtins.py:444 bzrlib/builtins.py:5231
192
msgid "You must supply either --revision or a revision_id"
195
#: bzrlib/builtins.py:451
197
msgid "Repository %r does not support access to raw revision texts"
200
#: bzrlib/builtins.py:462
201
msgid "The repository {0} contains no revision {1}."
204
#: bzrlib/builtins.py:469
205
msgid "You cannot specify a NULL revision."
208
#: bzrlib/builtins.py:561
209
msgid "Remove the working tree from a given branch/checkout."
212
#: bzrlib/builtins.py:563
214
"Since a lightweight checkout is little more than a working tree\n"
215
"this will refuse to run against one."
218
#: bzrlib/builtins.py:566
219
msgid "To re-create the working tree, use \"bzr checkout\"."
222
#: bzrlib/builtins.py:572
224
"Remove the working tree even if it has uncommitted or shelved changes."
227
#: bzrlib/builtins.py:586
228
msgid "No working tree to remove"
231
#: bzrlib/builtins.py:588
232
msgid "You cannot remove the working tree of a remote path"
235
#: bzrlib/builtins.py:597
236
msgid "You cannot remove the working tree from a lightweight checkout"
239
#: bzrlib/builtins.py:637
241
"The tree does not appear to be corrupt. You probably want \"bzr revert\" "
242
"instead. Use \"--force\" if you are sure you want to reset the working tree."
245
#: bzrlib/builtins.py:648
247
", the header appears corrupt, try passing -r -1 to set the state to the last "
251
#: bzrlib/builtins.py:652
252
msgid "failed to reset the tree state{0}"
255
#: bzrlib/builtins.py:656
256
msgid "Show current revision number."
259
#: bzrlib/builtins.py:658
260
msgid "This is equal to the number of revisions on this branch."
263
#: bzrlib/builtins.py:671
264
msgid "--tree and --revision can not be used together"
267
#: bzrlib/builtins.py:688
268
msgid "Revision numbers only make sense for single revisions, not ranges"
271
#: bzrlib/builtins.py:712
272
msgid "Show revno of working tree."
275
#: bzrlib/builtins.py:760
276
msgid "Add specified files or directories."
279
#: bzrlib/builtins.py:762
281
"In non-recursive mode, all the named items are added, regardless\n"
282
"of whether they were previously ignored. A warning is given if\n"
283
"any of the named files are already versioned."
286
#: bzrlib/builtins.py:766
288
"In recursive mode (the default), files are treated the same way\n"
289
"but the behaviour for directories is different. Directories that\n"
290
"are already versioned do not give a warning. All directories,\n"
291
"whether already versioned or not, are searched for files or\n"
292
"subdirectories that are neither versioned or ignored, and these\n"
293
"are added. This search proceeds recursively into versioned\n"
294
"directories. If no names are given '.' is assumed."
297
#: bzrlib/builtins.py:774
299
"A warning will be printed when nested trees are encountered,\n"
300
"unless they are explicitly ignored."
303
#: bzrlib/builtins.py:777
305
"Therefore simply saying 'bzr add' will version all files that\n"
306
"are currently unknown."
309
#: bzrlib/builtins.py:780
311
"Adding a file whose parent directory is not versioned will\n"
312
"implicitly add the parent, and so on up to the root. This means\n"
313
"you should never need to explicitly add a directory, they'll just\n"
314
"get added when you add a file in the directory."
317
#: bzrlib/builtins.py:785
319
"--dry-run will show which files would be added, but not actually\n"
323
#: bzrlib/builtins.py:788
325
"--file-ids-from will try to use the file ids from the supplied path.\n"
326
"It looks up ids trying to find a matching parent directory with the\n"
327
"same filename, and then by pure path. This option is rarely needed\n"
328
"but can be useful when adding the same logical file into two\n"
329
"branches that will be merged later (without showing the two different\n"
330
"adds as a conflict). It is also useful when merging another project\n"
331
"into a subdirectory of this one."
334
#: bzrlib/builtins.py:796
336
"Any files matching patterns in the ignore list will not be added\n"
337
"unless they are explicitly mentioned."
340
#: bzrlib/builtins.py:799
342
"In recursive mode, files larger than the configuration option \n"
343
"add.maximum_file_size will be skipped. Named items are never skipped due\n"
347
#: bzrlib/builtins.py:806
348
msgid "Don't recursively add the contents of directories."
351
#: bzrlib/builtins.py:813
352
msgid "Lookup file ids from this tree."
355
#: bzrlib/builtins.py:849
356
msgid "ignored {0} matching \"{1}\"\n"
359
#: bzrlib/builtins.py:854
360
msgid "Create a new versioned directory."
363
#: bzrlib/builtins.py:856
364
msgid "This is equivalent to creating the directory and then adding it."
367
#: bzrlib/builtins.py:863
368
msgid "No error if existing, make parent directories as needed."
371
#: bzrlib/builtins.py:897
376
#: bzrlib/builtins.py:939
378
msgid "invalid kind %r specified"
381
#: bzrlib/builtins.py:976
382
msgid "Move or rename a file."
385
#: bzrlib/builtins.py:978
386
msgid " bzr mv SOURCE... DESTINATION"
389
#: bzrlib/builtins.py:980
391
"If the last argument is a versioned directory, all the other names\n"
392
"are moved into it. Otherwise, there must be exactly two arguments\n"
393
"and the file is changed to a new name."
396
#: bzrlib/builtins.py:984
398
"If OLDNAME does not exist on the filesystem but is versioned and\n"
399
"NEWNAME does exist on the filesystem but is not versioned, mv\n"
400
"assumes that the file has been manually moved and only updates\n"
401
"its internal inventory to reflect that change.\n"
402
"The same is valid when moving many SOURCE files to a DESTINATION."
405
#: bzrlib/builtins.py:990
406
msgid "Files cannot be moved between branches."
409
#: bzrlib/builtins.py:997
411
"Move only the bzr identifier of the file, because the file has already been "
415
#: bzrlib/builtins.py:999
416
msgid "Automatically guess renames."
419
#: bzrlib/builtins.py:1000
420
msgid "Avoid making changes when guessing renames."
423
#: bzrlib/builtins.py:1009
424
msgid "--dry-run requires --auto."
427
#: bzrlib/builtins.py:1013
428
msgid "missing file argument"
431
#: bzrlib/builtins.py:1017
432
msgid "can not move root of branch"
435
#: bzrlib/builtins.py:1023
436
msgid "Only one path may be specified to --auto."
439
#: bzrlib/builtins.py:1026
440
msgid "--after cannot be specified with --auto."
443
#: bzrlib/builtins.py:1062
444
msgid "to mv multiple files the destination must be a versioned directory"
447
#: bzrlib/builtins.py:1114
448
msgid "Turn this branch into a mirror of another branch."
451
#: bzrlib/builtins.py:1116
453
"By default, this command only works on branches that have not diverged.\n"
454
"Branches are considered diverged if the destination branch's most recent \n"
455
"commit is one that has not been merged (directly or indirectly) into the \n"
459
#: bzrlib/builtins.py:1121
461
"If branches have diverged, you can use 'bzr merge' to integrate the changes\n"
462
"from one into the other. Once one branch has merged, the other should\n"
463
"be able to pull it again."
466
#: bzrlib/builtins.py:1125
468
"If you want to replace your local changes and just want your branch to\n"
469
"match the remote one, use pull --overwrite. This will work even if the two\n"
470
"branches have diverged."
473
#: bzrlib/builtins.py:1129
475
"If there is no default location set, the first pull will set it (use\n"
476
"--no-remember to avoid setting it). After that, you can omit the\n"
477
"location to use the default. To change the default, use --remember. The\n"
478
"value will only be saved if the remote location can be accessed."
481
#: bzrlib/builtins.py:1134
483
"The --verbose option will display the revisions pulled using the log_format\n"
484
"configuration option. You can use a different format by overriding it with\n"
485
"-Olog_format=<other_format>."
488
#: bzrlib/builtins.py:1138
490
"Note: The location can be specified either in the form of a branch,\n"
491
"or in the form of a path to a file containing a merge directive generated\n"
495
#: bzrlib/builtins.py:1146
496
msgid "Show logs of pulled revisions."
499
#: bzrlib/builtins.py:1148
501
"Branch to pull into, rather than the one containing the working directory."
504
#: bzrlib/builtins.py:1151
506
"Perform a local pull in a bound branch. Local pulls are not applied to the "
510
#: bzrlib/builtins.py:1188
511
msgid "No working tree, ignoring --show-base"
514
#: bzrlib/builtins.py:1204
515
msgid "No pull location known or specified."
518
#: bzrlib/builtins.py:1210
520
msgid "Using saved parent location: %s\n"
523
#: bzrlib/builtins.py:1217 bzrlib/builtins.py:4423
524
msgid "Cannot use -r with merge directives or bundles"
527
#: bzrlib/builtins.py:1260
528
msgid "Update a mirror of this branch."
531
#: bzrlib/builtins.py:1262
533
"The target branch will not have its working tree populated because this\n"
534
"is both expensive, and is not supported on remote file systems."
537
#: bzrlib/builtins.py:1265
539
"Some smart servers or protocols *may* put the working tree in place in\n"
543
#: bzrlib/builtins.py:1268
545
"This command only works on branches that have not diverged. Branches are\n"
546
"considered diverged if the destination branch's most recent commit is one\n"
547
"that has not been merged (directly or indirectly) by the source branch."
550
#: bzrlib/builtins.py:1272
552
"If branches have diverged, you can use 'bzr push --overwrite' to replace\n"
553
"the other branch completely, discarding its unmerged changes."
556
#: bzrlib/builtins.py:1275
558
"If you want to ensure you have the different changes in the other branch,\n"
559
"do a merge (see bzr help merge) from the other branch, and commit that.\n"
560
"After that you will be able to do a push without '--overwrite'."
563
#: bzrlib/builtins.py:1279
565
"If there is no default push location set, the first push will set it (use\n"
566
"--no-remember to avoid setting it). After that, you can omit the\n"
567
"location to use the default. To change the default, use --remember. The\n"
568
"value will only be saved if the remote location can be accessed."
571
#: bzrlib/builtins.py:1284
573
"The --verbose option will display the revisions pushed using the log_format\n"
574
"configuration option. You can use a different format by overriding it with\n"
575
"-Olog_format=<other_format>."
578
#: bzrlib/builtins.py:1295 bzrlib/foreign.py:272
580
"Branch to push from, rather than the one containing the working directory."
583
#: bzrlib/builtins.py:1298
585
"By default push will fail if the target directory exists, but does not "
586
"already have a control directory. This flag will allow push to proceed."
589
#: bzrlib/builtins.py:1303
591
"Create a stacked branch that references the public location of the parent "
595
#: bzrlib/builtins.py:1306
597
"Create a stacked branch that refers to another branch for the commit "
598
"history. Only the work not present in the referenced branch is included in "
599
"the branch created."
602
#: bzrlib/builtins.py:1311 bzrlib/foreign.py:279
604
"Refuse to push if there are uncommitted changes in the working tree, --no-"
605
"strict disables the check."
608
#: bzrlib/builtins.py:1314
609
msgid "Don't populate the working tree, even for protocols that support it."
612
#: bzrlib/builtins.py:1317
613
msgid "Overwrite tags only."
616
#: bzrlib/builtins.py:1368
617
msgid "Could not determine branch to refer to."
620
#: bzrlib/builtins.py:1377
623
"No push location known or specified. To push to the parent branch (at %s), "
624
"use 'bzr push :parent'."
627
#: bzrlib/builtins.py:1383 bzrlib/foreign.py:306
628
msgid "No push location known or specified."
631
#: bzrlib/builtins.py:1387
633
msgid "Using saved push location: %s"
636
#: bzrlib/builtins.py:1397
637
msgid "Create a new branch that is a copy of an existing branch."
640
#: bzrlib/builtins.py:1399
642
"If the TO_LOCATION is omitted, the last component of the FROM_LOCATION will\n"
643
"be used. In other words, \"branch ../foo/bar\" will attempt to create "
645
"If the FROM_LOCATION has no / or path separator embedded, the TO_LOCATION\n"
646
"is derived from the FROM_LOCATION by stripping a leading scheme or drive\n"
647
"identifier, if any. For example, \"branch lp:foo-bar\" will attempt to\n"
651
#: bzrlib/builtins.py:1406
653
"To retrieve the branch as of a particular revision, supply the --revision\n"
654
"parameter, as in \"branch foo/bar -r 5\"."
657
#: bzrlib/builtins.py:1409
658
msgid "The synonyms 'clone' and 'get' for this command are deprecated."
661
#: bzrlib/builtins.py:1419
662
msgid "Create a branch without a working-tree."
665
#: bzrlib/builtins.py:1421
666
msgid "Switch the checkout in the current directory to the new branch."
669
#: bzrlib/builtins.py:1424
671
"Create a stacked branch referring to the source branch. The new branch will "
672
"depend on the availability of the source branch for all operations."
675
#: bzrlib/builtins.py:1428
676
msgid "Do not use a shared repository, even if available."
679
#: bzrlib/builtins.py:1430
681
"By default branch will fail if the target directory exists, but does not "
682
"already have a control directory. This flag will allow branch to proceed."
685
#: bzrlib/builtins.py:1435
686
msgid "Bind new branch to from location."
689
#: bzrlib/builtins.py:1482
691
msgid "Target directory \"%s\" already exists."
694
#: bzrlib/builtins.py:1494
696
msgid "Parent of \"%s\" does not exist."
699
#: bzrlib/builtins.py:1513
700
msgid "The branch {0} has no revision {1}."
703
#: bzrlib/builtins.py:1528 bzrlib/push.py:53
705
msgid "Created new stacked branch referring to %s."
708
#: bzrlib/builtins.py:1532
710
msgid "Branched %d revision."
711
msgid_plural "Branched %d revisions."
715
#: bzrlib/builtins.py:1537
717
msgid "New branch bound to %s"
720
#: bzrlib/builtins.py:1542 bzrlib/builtins.py:6283
722
msgid "Switched to branch: %s"
725
#: bzrlib/builtins.py:1547
726
msgid "List the branches available at the current location."
729
#: bzrlib/builtins.py:1549
731
"This command will print the names of all the branches at the current\n"
735
#: bzrlib/builtins.py:1556
737
"Recursively scan for branches rather than just looking in the specified "
741
#: bzrlib/builtins.py:1585
745
#: bzrlib/builtins.py:1597
746
msgid "Create a new checkout of an existing branch."
749
#: bzrlib/builtins.py:1599
751
"If BRANCH_LOCATION is omitted, checkout will reconstitute a working tree "
753
"the branch found in '.'. This is useful if you have removed the working "
755
"or if it was never created - i.e. if you pushed the branch to its current\n"
756
"location using SFTP."
759
#: bzrlib/builtins.py:1604
761
"If the TO_LOCATION is omitted, the last component of the BRANCH_LOCATION "
763
"be used. In other words, \"checkout ../foo/bar\" will attempt to create "
765
"If the BRANCH_LOCATION has no / or path separator embedded, the TO_LOCATION\n"
766
"is derived from the BRANCH_LOCATION by stripping a leading scheme or drive\n"
767
"identifier, if any. For example, \"checkout lp:foo-bar\" will attempt to\n"
771
#: bzrlib/builtins.py:1611
773
"To retrieve the branch as of a particular revision, supply the --revision\n"
774
"parameter, as in \"checkout foo/bar -r 5\". Note that this will be "
776
"out of date [so you cannot commit] but it may be useful (i.e. to examine "
781
#: bzrlib/builtins.py:1621
783
"Perform a lightweight checkout. Lightweight checkouts depend on access to "
784
"the branch for every operation. Normal checkouts can perform common "
785
"operations like diff and status without such access, and also support local "
789
#: bzrlib/builtins.py:1628
790
msgid "Get file contents from this tree."
793
#: bzrlib/builtins.py:1630
794
msgid "Hard-link working tree files where possible."
797
#: bzrlib/builtins.py:1671
799
"Show list of renamed files.\n"
803
#: bzrlib/builtins.py:1699
804
msgid "Update a working tree to a new revision."
807
#: bzrlib/builtins.py:1701
809
"This will perform a merge of the destination revision (the tip of the\n"
810
"branch, or the specified revision) into the working tree, and then make\n"
811
"that revision the basis revision for the working tree. "
814
#: bzrlib/builtins.py:1705
816
"You can use this to visit an older revision, or to update a working tree\n"
817
"that is out of date from its branch."
820
#: bzrlib/builtins.py:1708
822
"If there are any uncommitted changes in the tree, they will be carried\n"
823
"across and remain as uncommitted changes after the update. To discard\n"
824
"these changes, use 'bzr revert'. The uncommitted changes may conflict\n"
825
"with the changes brought in by the change in basis revision."
828
#: bzrlib/builtins.py:1713
830
"If the tree's branch is bound to a master branch, bzr will also update\n"
831
"the branch from the master."
834
#: bzrlib/builtins.py:1716
836
"You cannot update just a single file or directory, because each Bazaar\n"
837
"working tree has just a single basis revision. If you want to restore a\n"
838
"file that has been removed locally, use 'bzr revert' instead of 'bzr\n"
839
"update'. If you want to restore a file to its state in a previous\n"
840
"revision, use 'bzr revert' with a '-r' option, or use 'bzr cat' to write\n"
841
"out the old content of that file to a new location."
844
#: bzrlib/builtins.py:1723
846
"The 'dir' argument, if given, must be the location of the root of a\n"
847
"working tree to update. By default, the working tree that contains the \n"
848
"current working directory is used."
851
#: bzrlib/builtins.py:1739
852
msgid "bzr update --revision takes exactly one revision"
855
#: bzrlib/builtins.py:1747
856
msgid "bzr update can only update a whole tree, not a file or subdirectory"
859
#: bzrlib/builtins.py:1778
860
msgid "Tree is up to date at revision {0} of branch {1}"
863
#: bzrlib/builtins.py:1794
866
"branch has no revision %s\n"
867
"bzr update --revision only works for a revision in the branch history"
870
#: bzrlib/builtins.py:1800
871
msgid "Updated to revision {0} of branch {1}"
874
#: bzrlib/builtins.py:1804
876
"Your local commits will now show as pending merges with 'bzr status', and "
877
"can be committed with 'bzr commit'."
880
#: bzrlib/builtins.py:1813
881
msgid "Show information about a working tree, branch or repository."
884
#: bzrlib/builtins.py:1815
886
"This command will show all known locations and formats associated to the\n"
887
"tree, branch or repository."
890
#: bzrlib/builtins.py:1818
892
"In verbose mode, statistical information is included with each report.\n"
893
"To see extended statistic information, use a verbosity level of 2 or\n"
894
"higher by specifying the verbose option multiple times, e.g. -vv."
897
#: bzrlib/builtins.py:1822
898
msgid "Branches and working trees will also report any missing revisions."
901
#: bzrlib/builtins.py:1824 bzrlib/builtins.py:3742 bzrlib/builtins.py:4883
902
#: bzrlib/builtins.py:6469
906
#: bzrlib/builtins.py:1826
907
msgid " Display information on the format and related locations:"
910
#: bzrlib/builtins.py:1828
914
#: bzrlib/builtins.py:1830
916
" Display the above together with extended format information and\n"
917
" basic statistics (like the number of files in the working tree and\n"
918
" number of revisions in the branch and repository):"
921
#: bzrlib/builtins.py:1834
925
#: bzrlib/builtins.py:1836
926
msgid " Display the above together with number of committers to the branch:"
929
#: bzrlib/builtins.py:1838
930
msgid " bzr info -vv"
933
#: bzrlib/builtins.py:1857
934
msgid "Remove files or directories."
937
#: bzrlib/builtins.py:1859
939
"This makes Bazaar stop tracking changes to the specified files. Bazaar will\n"
940
"delete them if they can easily be recovered using revert otherwise they\n"
941
"will be backed up (adding an extension of the form .~#~). If no options or\n"
942
"parameters are given Bazaar will scan for files that are being tracked by\n"
943
"Bazaar but missing in your tree and stop tracking them for you."
946
#: bzrlib/builtins.py:1867
947
msgid "Only remove files that have never been committed."
950
#: bzrlib/builtins.py:1869
951
msgid "The file deletion mode to be used."
954
#: bzrlib/builtins.py:1870
955
msgid "Deletion Strategy"
958
#: bzrlib/builtins.py:1871
959
msgid "Backup changed files (default)."
962
#: bzrlib/builtins.py:1872
963
msgid "Delete from bzr but leave the working copy."
966
#: bzrlib/builtins.py:1873
967
msgid "Don't backup changed files."
970
#: bzrlib/builtins.py:1894
971
msgid "No matching files."
974
#: bzrlib/builtins.py:1955
975
msgid "Reconcile bzr metadata in a branch."
978
#: bzrlib/builtins.py:1957
980
"This can correct data mismatches that may have been caused by\n"
981
"previous ghost operations or bzr upgrades. You should only\n"
982
"need to run this command if 'bzr check' or a bzr developer\n"
983
"advises you to run it."
986
#: bzrlib/builtins.py:1962
988
"If a second branch is provided, cross-branch reconciliation is\n"
989
"also attempted, which will check that data like the tree root\n"
990
"id which was not present in very early bzr versions is represented\n"
991
"correctly in both branches."
994
#: bzrlib/builtins.py:1967
996
"At the same time it is run it may recompress data resulting in\n"
997
"a potential saving in disk space or performance gain."
1000
#: bzrlib/builtins.py:1970
1001
msgid "The branch *MUST* be on a listable system such as local disk or sftp."
1004
#: bzrlib/builtins.py:2037 bzrlib/builtins.py:2155 bzrlib/builtins.py:3777
1006
"Format for the bzr 2.0 series.\n"
1007
"Uses group-compress storage.\n"
1008
"Provides rich roots which are a one-way transition.\n"
1011
#: bzrlib/builtins.py:2037 bzrlib/builtins.py:2155 bzrlib/builtins.py:3777
1013
"Pack-based format used in 1.x series. Introduced in 0.92. Interoperates with "
1014
"bzr repositories before 0.92 but cannot be read by bzr < 0.92. "
1017
#: bzrlib/builtins.py:2037 bzrlib/builtins.py:2155 bzrlib/builtins.py:3777
1018
msgid "The 2a format with experimental support for colocated branches.\n"
1021
#: bzrlib/builtins.py:2038
1022
msgid "Make a directory into a versioned branch."
1025
#: bzrlib/builtins.py:2040
1027
"Use this to create an empty branch, or before importing an\n"
1031
#: bzrlib/builtins.py:2043
1033
"If there is a repository in a parent directory of the location, then\n"
1034
"the history of the branch will be stored in the repository. Otherwise\n"
1035
"init creates a standalone branch which carries its own history\n"
1036
"in the .bzr directory."
1039
#: bzrlib/builtins.py:2048
1041
"If there is already a branch at the location but it has no working tree,\n"
1042
"the tree can be populated with 'bzr checkout'."
1045
#: bzrlib/builtins.py:2051
1046
msgid "Recipe for importing a tree of files::"
1049
#: bzrlib/builtins.py:2053
1055
" bzr commit -m \"imported project\""
1058
#: bzrlib/builtins.py:2064
1060
"Create the path leading up to the branch if it does not already exist."
1063
#: bzrlib/builtins.py:2067
1064
msgid "Specify a format for this branch. See \"help formats\"."
1067
#: bzrlib/builtins.py:2075
1069
"Never change revnos or the existing log. Append revisions to it only."
1072
#: bzrlib/builtins.py:2078
1073
msgid "Create a branch without a working tree."
1076
#: bzrlib/builtins.py:2098 bzrlib/push.py:110
1079
"Parent directory of %s does not exist.\n"
1080
"You may supply --create-prefix to create all leading parent directories."
1083
#: bzrlib/builtins.py:2132
1085
"This branch format cannot be set to append-revisions-only. Try --default."
1088
#: bzrlib/builtins.py:2143
1089
msgid "Created a {0} (format: {1})\n"
1092
#: bzrlib/builtins.py:2152
1094
msgid "Using shared repository: %s\n"
1097
#: bzrlib/builtins.py:2156
1098
msgid "Create a shared repository for branches to share storage space."
1101
#: bzrlib/builtins.py:2158
1103
"New branches created under the repository directory will store their\n"
1104
"revisions in the repository, not in the branch directory. For branches\n"
1105
"with shared history, this reduces the amount of storage needed and \n"
1106
"speeds up the creation of new branches."
1109
#: bzrlib/builtins.py:2163
1111
"If the --no-trees option is given then the branches in the repository\n"
1112
"will not have working trees by default. They will still exist as \n"
1113
"directories on disk, but they will not have separate copies of the \n"
1114
"files at a certain revision. This can be useful for repositories that\n"
1115
"store branches which are interacted with through checkouts or remote\n"
1116
"branches, such as on a server."
1119
#: bzrlib/builtins.py:2170
1122
" Create a shared repository holding just branches::"
1125
#: bzrlib/builtins.py:2173
1127
" bzr init-repo --no-trees repo\n"
1128
" bzr init repo/trunk"
1131
#: bzrlib/builtins.py:2176
1132
msgid " Make a lightweight checkout elsewhere::"
1135
#: bzrlib/builtins.py:2178
1137
" bzr checkout --lightweight repo/trunk trunk-checkout\n"
1138
" cd trunk-checkout\n"
1142
#: bzrlib/builtins.py:2186
1144
"Specify a format for this repository. See \"bzr help formats\" for details."
1147
#: bzrlib/builtins.py:2190
1148
msgid "Repository format"
1151
#: bzrlib/builtins.py:2192
1152
msgid "Branches in the repository will default to not having a working tree."
1155
#: bzrlib/builtins.py:2218
1156
msgid "Show differences in the working tree, between revisions or branches."
1159
#: bzrlib/builtins.py:2220
1161
"If no arguments are given, all changes for the current tree are listed.\n"
1162
"If files are given, only the changes in those files are listed.\n"
1163
"Remote and multiple branches can be compared by using the --old and\n"
1164
"--new options. If not provided, the default for both is derived from\n"
1165
"the first argument, if any, or the current tree if no arguments are\n"
1169
#: bzrlib/builtins.py:2227
1171
"\"bzr diff -p1\" is equivalent to \"bzr diff --prefix old/:new/\", and\n"
1172
"produces patches suitable for \"patch -p1\"."
1175
#: bzrlib/builtins.py:2230
1177
"Note that when using the -r argument with a range of revisions, the\n"
1178
"differences are computed between the two specified revisions. That\n"
1179
"is, the command does not show the changes introduced by the first \n"
1180
"revision in the range. This differs from the interpretation of \n"
1181
"revision ranges used by \"bzr log\" which includes the first revision\n"
1185
#: bzrlib/builtins.py:2237
1189
" 2 - unrepresentable changes\n"
1194
#: bzrlib/builtins.py:2243
1197
" Shows the difference in the working tree versus the last commit::"
1200
#: bzrlib/builtins.py:2246
1204
#: bzrlib/builtins.py:2248
1205
msgid " Difference between the working tree and revision 1::"
1208
#: bzrlib/builtins.py:2250
1209
msgid " bzr diff -r1"
1212
#: bzrlib/builtins.py:2252
1213
msgid " Difference between revision 3 and revision 1::"
1216
#: bzrlib/builtins.py:2254
1217
msgid " bzr diff -r1..3"
1220
#: bzrlib/builtins.py:2256
1221
msgid " Difference between revision 3 and revision 1 for branch xxx::"
1224
#: bzrlib/builtins.py:2258
1225
msgid " bzr diff -r1..3 xxx"
1228
#: bzrlib/builtins.py:2260
1229
msgid " The changes introduced by revision 2 (equivalent to -r1..2)::"
1232
#: bzrlib/builtins.py:2262
1233
msgid " bzr diff -c2"
1236
#: bzrlib/builtins.py:2264
1238
" To see the changes introduced by revision X::\n"
1243
#: bzrlib/builtins.py:2268
1245
" Note that in the case of a merge, the -c option shows the changes\n"
1246
" compared to the left hand parent. To see the changes against\n"
1247
" another parent, use::"
1250
#: bzrlib/builtins.py:2272
1251
msgid " bzr diff -r<chosen_parent>..X"
1254
#: bzrlib/builtins.py:2274
1256
" The changes between the current revision and the previous revision\n"
1257
" (equivalent to -c-1 and -r-2..-1)"
1260
#: bzrlib/builtins.py:2277
1261
msgid " bzr diff -r-2.."
1264
#: bzrlib/builtins.py:2279
1265
msgid " Show just the differences for file NEWS::"
1268
#: bzrlib/builtins.py:2281
1269
msgid " bzr diff NEWS"
1272
#: bzrlib/builtins.py:2283
1273
msgid " Show the differences in working tree xxx for file NEWS::"
1276
#: bzrlib/builtins.py:2285
1277
msgid " bzr diff xxx/NEWS"
1280
#: bzrlib/builtins.py:2287
1281
msgid " Show the differences from branch xxx to this working tree:"
1284
#: bzrlib/builtins.py:2289
1285
msgid " bzr diff --old xxx"
1288
#: bzrlib/builtins.py:2291
1289
msgid " Show the differences between two branches for file NEWS::"
1292
#: bzrlib/builtins.py:2293
1293
msgid " bzr diff --old xxx --new yyy NEWS"
1296
#: bzrlib/builtins.py:2295
1297
msgid " Same as 'bzr diff' but prefix paths with old/ and new/::"
1300
#: bzrlib/builtins.py:2297
1302
" bzr diff --prefix old/:new/\n"
1304
" Show the differences using a custom diff program with options::\n"
1306
" bzr diff --using /usr/bin/diff --diff-options -wu"
1309
#: bzrlib/builtins.py:2307
1310
msgid "Pass these options to the external diff program."
1313
#: bzrlib/builtins.py:2310
1315
"Set prefixes added to old and new filenames, as two values separated by a "
1316
"colon. (eg \"old/:new/\")."
1319
#: bzrlib/builtins.py:2313
1320
msgid "Branch/tree to compare from."
1323
#: bzrlib/builtins.py:2317
1324
msgid "Branch/tree to compare to."
1327
#: bzrlib/builtins.py:2323
1328
msgid "Use this command to compare files."
1331
#: bzrlib/builtins.py:2328
1332
msgid "Diff format to use."
1335
#: bzrlib/builtins.py:2330
1339
#: bzrlib/builtins.py:2332
1340
msgid "How many lines of context to show."
1343
#: bzrlib/builtins.py:2357
1344
msgid "--prefix expects two values separated by a colon (eg \"old/:new/\")"
1347
#: bzrlib/builtins.py:2361
1348
msgid "bzr diff --revision takes exactly one or two revision specifiers"
1351
#: bzrlib/builtins.py:2366 bzrlib/builtins.py:2763 bzrlib/builtins.py:2776
1352
#: bzrlib/builtins.py:2784 bzrlib/builtins.py:4957
1353
msgid "{0} and {1} are mutually exclusive"
1356
#: bzrlib/builtins.py:2386
1358
"List files deleted in the working tree.\n"
1362
#: bzrlib/builtins.py:2463
1363
msgid "Show the tree root directory."
1366
#: bzrlib/builtins.py:2465
1368
"The root is the nearest enclosing directory with a .bzr control\n"
1372
#: bzrlib/builtins.py:2480
1373
msgid "The limit argument must be an integer."
1376
#: bzrlib/builtins.py:2488
1377
msgid "The levels argument must be an integer."
1380
#: bzrlib/builtins.py:2493
1381
msgid "Show historical log for a branch or subset of a branch."
1384
#: bzrlib/builtins.py:2495
1386
"log is bzr's default tool for exploring the history of a branch.\n"
1387
"The branch to use is taken from the first parameter. If no parameters\n"
1388
"are given, the branch containing the working directory is logged.\n"
1389
"Here are some simple examples::"
1392
#: bzrlib/builtins.py:2500
1394
" bzr log log the current branch\n"
1395
" bzr log foo.py log a file in its branch\n"
1396
" bzr log http://server/branch log a branch on a server"
1399
#: bzrlib/builtins.py:2504
1401
"The filtering, ordering and information shown for each revision can\n"
1402
"be controlled as explained below. By default, all revisions are\n"
1403
"shown sorted (topologically) so that newer revisions appear before\n"
1404
"older ones and descendants always appear before ancestors. If displayed,\n"
1405
"merged revisions are shown indented under the revision in which they\n"
1409
#: bzrlib/builtins.py:2511
1410
msgid ":Output control:"
1413
#: bzrlib/builtins.py:2513
1415
" The log format controls how information about each revision is\n"
1416
" displayed. The standard log formats are called ``long``, ``short``\n"
1417
" and ``line``. The default is long. See ``bzr help log-formats``\n"
1418
" for more details on log formats."
1421
#: bzrlib/builtins.py:2518
1423
" The following options can be used to control what information is\n"
1427
#: bzrlib/builtins.py:2521
1429
" -l N display a maximum of N revisions\n"
1430
" -n N display N levels of revisions (0 for all, 1 for collapsed)\n"
1431
" -v display a status summary (delta) for each revision\n"
1432
" -p display a diff (patch) for each revision\n"
1433
" --show-ids display revision-ids (and file-ids), not just revnos"
1436
#: bzrlib/builtins.py:2527
1438
" Note that the default number of levels to display is a function of the\n"
1439
" log format. If the -n option is not used, the standard log formats show\n"
1440
" just the top level (mainline)."
1443
#: bzrlib/builtins.py:2531
1445
" Status summaries are shown using status flags like A, M, etc. To see\n"
1446
" the changes explained using words like ``added`` and ``modified``\n"
1447
" instead, use the -vv option."
1450
#: bzrlib/builtins.py:2535
1451
msgid ":Ordering control:"
1454
#: bzrlib/builtins.py:2537
1456
" To display revisions from oldest to newest, use the --forward option.\n"
1457
" In most cases, using this option will have little impact on the total\n"
1458
" time taken to produce a log, though --forward does not incrementally\n"
1459
" display revisions like --reverse does when it can."
1462
#: bzrlib/builtins.py:2542
1463
msgid ":Revision filtering:"
1466
#: bzrlib/builtins.py:2544
1468
" The -r option can be used to specify what revision or range of revisions\n"
1469
" to filter against. The various forms are shown below::"
1472
#: bzrlib/builtins.py:2547
1474
" -rX display revision X\n"
1475
" -rX.. display revision X and later\n"
1476
" -r..Y display up to and including revision Y\n"
1477
" -rX..Y display from X to Y inclusive"
1480
#: bzrlib/builtins.py:2552
1482
" See ``bzr help revisionspec`` for details on how to specify X and Y.\n"
1483
" Some common examples are given below::"
1486
#: bzrlib/builtins.py:2555
1488
" -r-1 show just the tip\n"
1489
" -r-10.. show the last 10 mainline revisions\n"
1490
" -rsubmit:.. show what's new on this branch\n"
1491
" -rancestor:path.. show changes since the common ancestor of this\n"
1492
" branch and the one at location path\n"
1493
" -rdate:yesterday.. show changes since yesterday"
1496
#: bzrlib/builtins.py:2562
1498
" When logging a range of revisions using -rX..Y, log starts at\n"
1499
" revision Y and searches back in history through the primary\n"
1500
" (\"left-hand\") parents until it finds X. When logging just the\n"
1501
" top level (using -n1), an error is reported if X is not found\n"
1502
" along the way. If multi-level logging is used (-n0), X may be\n"
1503
" a nested merge revision and the log will be truncated accordingly."
1506
#: bzrlib/builtins.py:2569
1507
msgid ":Path filtering:"
1510
#: bzrlib/builtins.py:2571
1512
" If parameters are given and the first one is not a branch, the log\n"
1513
" will be filtered to show only those revisions that changed the\n"
1514
" nominated files or directories."
1517
#: bzrlib/builtins.py:2575
1519
" Filenames are interpreted within their historical context. To log a\n"
1520
" deleted file, specify a revision range so that the file existed at\n"
1521
" the end or start of the range."
1524
#: bzrlib/builtins.py:2579
1526
" Historical context is also important when interpreting pathnames of\n"
1527
" renamed files/directories. Consider the following example:"
1530
#: bzrlib/builtins.py:2582
1532
" * revision 1: add tutorial.txt\n"
1533
" * revision 2: modify tutorial.txt\n"
1534
" * revision 3: rename tutorial.txt to guide.txt; add tutorial.txt"
1537
#: bzrlib/builtins.py:2586
1538
msgid " In this case:"
1541
#: bzrlib/builtins.py:2588
1542
msgid " * ``bzr log guide.txt`` will log the file added in revision 1"
1545
#: bzrlib/builtins.py:2590
1547
" * ``bzr log tutorial.txt`` will log the new file added in revision 3"
1550
#: bzrlib/builtins.py:2592
1552
" * ``bzr log -r2 -p tutorial.txt`` will show the changes made to\n"
1553
" the original file in revision 2."
1556
#: bzrlib/builtins.py:2595
1558
" * ``bzr log -r2 -p guide.txt`` will display an error message as there\n"
1559
" was no file called guide.txt in revision 2."
1562
#: bzrlib/builtins.py:2598
1564
" Renames are always followed by log. By design, there is no need to\n"
1565
" explicitly ask for this (and no way to stop logging a file back\n"
1566
" until it was last renamed)."
1569
#: bzrlib/builtins.py:2602
1570
msgid ":Other filtering:"
1573
#: bzrlib/builtins.py:2604
1575
" The --match option can be used for finding revisions that match a\n"
1576
" regular expression in a commit message, committer, author or bug.\n"
1577
" Specifying the option several times will match any of the supplied\n"
1578
" expressions. --match-author, --match-bugs, --match-committer and\n"
1579
" --match-message can be used to only match a specific field."
1582
#: bzrlib/builtins.py:2610
1583
msgid ":Tips & tricks:"
1586
#: bzrlib/builtins.py:2612
1588
" GUI tools and IDEs are often better at exploring history than command\n"
1589
" line tools: you may prefer qlog or viz from qbzr or bzr-gtk, the\n"
1590
" bzr-explorer shell, or the Loggerhead web interface. See the Plugin\n"
1591
" Guide <http://doc.bazaar.canonical.com/plugins/en/> and\n"
1592
" <http://wiki.bazaar.canonical.com/IDEIntegration>. "
1595
#: bzrlib/builtins.py:2618
1597
" You may find it useful to add the aliases below to ``bazaar.conf``::"
1600
#: bzrlib/builtins.py:2620
1604
" top = log -l10 --line\n"
1608
#: bzrlib/builtins.py:2625
1610
" ``bzr tip`` will then show the latest revision while ``bzr top``\n"
1611
" will show the last 10 mainline revisions. To see the details of a\n"
1612
" particular revision X, ``bzr show -rX``."
1615
#: bzrlib/builtins.py:2629
1617
" If you are interested in looking deeper into a particular merge X,\n"
1618
" use ``bzr log -n0 -rX``."
1621
#: bzrlib/builtins.py:2632
1623
" ``bzr log -v`` on a branch with lots of history is currently\n"
1624
" very slow. A fix for this issue is currently under development.\n"
1625
" With or without that fix, it is recommended that a revision range\n"
1626
" be given when using the -v option."
1629
#: bzrlib/builtins.py:2637
1631
" bzr has a generic full-text matching plugin, bzr-search, that can be\n"
1632
" used to find revisions matching user names, commit messages, etc.\n"
1633
" Among other features, this plugin can find all revisions containing\n"
1634
" a list of words but not others."
1637
#: bzrlib/builtins.py:2642
1639
" When exploring non-mainline history on large projects with deep\n"
1640
" history, the performance of log can be greatly improved by installing\n"
1641
" the historycache plugin. This plugin buffers historical information\n"
1642
" trading disk space for faster speed."
1645
#: bzrlib/builtins.py:2651
1646
msgid "Show from oldest to newest."
1649
#: bzrlib/builtins.py:2654
1650
msgid "Show files changed in each revision."
1653
#: bzrlib/builtins.py:2660
1654
msgid "Show just the specified revision. See also \"help revisionspec\"."
1657
#: bzrlib/builtins.py:2664
1658
msgid "What names to list as authors - first, all or committer."
1661
#: bzrlib/builtins.py:2665
1665
#: bzrlib/builtins.py:2670
1666
msgid "Number of levels to display - 0 for all, 1 for flat."
1669
#: bzrlib/builtins.py:2680
1670
msgid "Limit the output to the first N revisions."
1673
#: bzrlib/builtins.py:2685
1674
msgid "Show changes made in each revision as a patch."
1677
#: bzrlib/builtins.py:2687
1678
msgid "Show merged revisions like --levels 0 does."
1681
#: bzrlib/builtins.py:2691
1682
msgid "Do not report commits with more than one parent."
1685
#: bzrlib/builtins.py:2693
1687
"Display only the revisions that are not part of both ancestries (require -"
1691
#: bzrlib/builtins.py:2697
1692
msgid "Show digital signature validity."
1695
#: bzrlib/builtins.py:2700
1696
msgid "Show revisions whose properties match this expression."
1699
#: bzrlib/builtins.py:2704
1700
msgid "Show revisions whose message matches this expression."
1703
#: bzrlib/builtins.py:2708
1704
msgid "Show revisions whose committer matches this expression."
1707
#: bzrlib/builtins.py:2712
1708
msgid "Show revisions whose authors match this expression."
1711
#: bzrlib/builtins.py:2716
1712
msgid "Show revisions whose bugs match this expression."
1715
#: bzrlib/builtins.py:2770
1716
msgid "--exclude-common-ancestry requires -r with two revisions"
1719
#: bzrlib/builtins.py:2798
1721
msgid "Path unknown at end or start of revision range: %s"
1724
#: bzrlib/builtins.py:2915
1726
msgid "bzr %s doesn't accept two revisions in different branches."
1729
#: bzrlib/builtins.py:2931
1731
msgid "bzr %s --revision takes one or two values."
1734
#: bzrlib/builtins.py:2976
1736
"List files in a tree.\n"
1740
#: bzrlib/builtins.py:2985
1741
msgid "Recurse into subdirectories."
1744
#: bzrlib/builtins.py:2987
1745
msgid "Print paths relative to the root of the branch."
1748
#: bzrlib/builtins.py:2989
1749
msgid "Print unknown files."
1752
#: bzrlib/builtins.py:2990
1753
msgid "Print versioned files."
1756
#: bzrlib/builtins.py:2993
1757
msgid "Print ignored files."
1760
#: bzrlib/builtins.py:2995
1761
msgid "List entries of a particular kind: file, directory, symlink."
1764
#: bzrlib/builtins.py:3008
1765
msgid "invalid kind specified"
1768
#: bzrlib/builtins.py:3011
1769
msgid "Cannot set both --verbose and --null"
1772
#: bzrlib/builtins.py:3020
1773
msgid "cannot specify both --from-root and PATH"
1776
#: bzrlib/builtins.py:3107
1777
msgid "Ignore specified files or patterns."
1780
#: bzrlib/builtins.py:3109
1781
msgid "See ``bzr help patterns`` for details on the syntax of patterns."
1784
#: bzrlib/builtins.py:3111
1786
"If a .bzrignore file does not exist, the ignore command\n"
1787
"will create one and add the specified files or patterns to the newly\n"
1788
"created file. The ignore command will also automatically add the \n"
1789
".bzrignore file to be versioned. Creating a .bzrignore file without\n"
1790
"the use of the ignore command will require an explicit add command."
1793
#: bzrlib/builtins.py:3117
1795
"To remove patterns from the ignore list, edit the .bzrignore file.\n"
1796
"After adding, editing or deleting that file either indirectly by\n"
1797
"using this command or directly by using an editor, be sure to commit\n"
1801
#: bzrlib/builtins.py:3122
1803
"Bazaar also supports a global ignore file ~/.bazaar/ignore. On Windows\n"
1804
"the global ignore file can be found in the application data directory as\n"
1805
"C:\\Documents and Settings\\<user>\\Application Data\\Bazaar\\2.0\\ignore.\n"
1806
"Global ignores are not touched by this command. The global ignore file\n"
1807
"can be edited directly using an editor."
1810
#: bzrlib/builtins.py:3128
1812
"Patterns prefixed with '!' are exceptions to ignore patterns and take\n"
1813
"precedence over regular ignores. Such exceptions are used to specify\n"
1814
"files that should be versioned which would otherwise be ignored."
1817
#: bzrlib/builtins.py:3132
1819
"Patterns prefixed with '!!' act as regular ignore patterns, but have\n"
1820
"precedence over the '!' exception patterns."
1823
#: bzrlib/builtins.py:3135
1827
"* Ignore patterns containing shell wildcards must be quoted from\n"
1828
" the shell on Unix."
1831
#: bzrlib/builtins.py:3140
1833
"* Ignore patterns starting with \"#\" act as comments in the ignore file.\n"
1834
" To ignore patterns that begin with that character, use the \"RE:\" prefix."
1837
#: bzrlib/builtins.py:3143
1840
" Ignore the top level Makefile::"
1843
#: bzrlib/builtins.py:3146
1844
msgid " bzr ignore ./Makefile"
1847
#: bzrlib/builtins.py:3148
1848
msgid " Ignore .class files in all directories...::"
1851
#: bzrlib/builtins.py:3150
1852
msgid " bzr ignore \"*.class\""
1855
#: bzrlib/builtins.py:3152
1856
msgid " ...but do not ignore \"special.class\"::"
1859
#: bzrlib/builtins.py:3154
1860
msgid " bzr ignore \"!special.class\""
1863
#: bzrlib/builtins.py:3156
1864
msgid " Ignore files whose name begins with the \"#\" character::"
1867
#: bzrlib/builtins.py:3158
1868
msgid " bzr ignore \"RE:^#\""
1871
#: bzrlib/builtins.py:3160 bzrlib/builtins.py:3164
1872
msgid " Ignore .o files under the lib directory::"
1875
#: bzrlib/builtins.py:3162
1876
msgid " bzr ignore \"lib/**/*.o\""
1879
#: bzrlib/builtins.py:3166
1880
msgid " bzr ignore \"RE:lib/.*\\.o\""
1883
#: bzrlib/builtins.py:3168
1884
msgid " Ignore everything but the \"debian\" toplevel directory::"
1887
#: bzrlib/builtins.py:3170
1889
" bzr ignore \"RE:(?!debian/).*\"\n"
1891
" Ignore everything except the \"local\" toplevel directory,\n"
1892
" but always ignore autosave files ending in ~, even under local/::\n"
1894
" bzr ignore \"*\"\n"
1895
" bzr ignore \"!./local\"\n"
1896
" bzr ignore \"!!*~\""
1899
#: bzrlib/builtins.py:3184
1900
msgid "Display the default ignore rules that bzr uses."
1903
#: bzrlib/builtins.py:3196
1904
msgid "ignore requires at least one NAME_PATTERN or --default-rules."
1907
#: bzrlib/builtins.py:3207
1909
msgid "Invalid ignore pattern found. %s"
1910
msgid_plural "Invalid ignore patterns found. %s"
1914
#: bzrlib/builtins.py:3216
1915
msgid "NAME_PATTERN should not be an absolute path"
1918
#: bzrlib/builtins.py:3229
1921
"Warning: the following files are version controlled and match your ignore "
1924
"These files will continue to be version controlled unless you 'bzr remove' "
1928
#: bzrlib/builtins.py:3236
1929
msgid "List ignored files and the patterns that matched them."
1932
#: bzrlib/builtins.py:3238
1934
"List all the ignored files and the ignore pattern that caused the file to\n"
1938
#: bzrlib/builtins.py:3241
1939
msgid "Alternatively, to list just the files::"
1942
#: bzrlib/builtins.py:3243
1943
msgid " bzr ls --ignored"
1946
#: bzrlib/builtins.py:3277
1948
msgid "not a valid revision-number: %r"
1951
#: bzrlib/builtins.py:3284
1953
"Export current or past revision to a destination directory or archive."
1956
#: bzrlib/builtins.py:3286
1957
msgid "If no revision is specified this exports the last committed revision."
1960
#: bzrlib/builtins.py:3288
1962
"Format may be an \"exporter\" name, such as tar, tgz, tbz2. If none is\n"
1963
"given, try to find the format with the extension. If no extension\n"
1964
"is found exports to a directory (equivalent to --format=dir)."
1967
#: bzrlib/builtins.py:3292
1969
"If root is supplied, it will be used as the root directory inside\n"
1970
"container formats (tar, zip, etc). If it is not supplied it will default\n"
1971
"to the exported filename. The root option has no effect for 'dir' format."
1974
#: bzrlib/builtins.py:3296
1976
"If branch is omitted then the branch containing the current working\n"
1977
"directory will be used."
1980
#: bzrlib/builtins.py:3299
1982
"Note: Export of tree with non-ASCII filenames to zip is not supported."
1985
#: bzrlib/builtins.py:3301
1987
" ================= =========================\n"
1988
" Supported formats Autodetected by extension\n"
1989
" ================= =========================\n"
1992
" tbz2 .tar.bz2, .tbz2\n"
1993
" tgz .tar.gz, .tgz\n"
1995
" ================= ========================="
1998
#: bzrlib/builtins.py:3315
1999
msgid "Type of file to export to."
2002
#: bzrlib/builtins.py:3318
2003
msgid "Apply content filters to export the convenient form."
2006
#: bzrlib/builtins.py:3322
2007
msgid "Name of the root directory inside the exported file."
2010
#: bzrlib/builtins.py:3324
2012
"Set modification time of files to that of the last revision in which it was "
2016
#: bzrlib/builtins.py:3327
2018
"Export the working tree contents rather than that of the last revision."
2021
#: bzrlib/builtins.py:3346
2022
msgid "--uncommitted requires a working tree"
2025
#: bzrlib/builtins.py:3355
2027
msgid "Unsupported export format: %s"
2030
#: bzrlib/builtins.py:3359
2032
"Write the contents of a file as of a given revision to standard output."
2035
#: bzrlib/builtins.py:3361
2036
msgid "If no revision is nominated, the last revision is used."
2039
#: bzrlib/builtins.py:3363
2041
"Note: Take care to redirect standard output when using this command on a\n"
2045
#: bzrlib/builtins.py:3369
2046
msgid "The path name in the old tree."
2049
#: bzrlib/builtins.py:3370
2050
msgid "Apply content filters to display the convenience form."
2053
#: bzrlib/builtins.py:3381
2054
msgid "bzr cat --revision takes exactly one revision specifier"
2057
#: bzrlib/builtins.py:3406 bzrlib/builtins.py:3418
2058
msgid "{0!r} is not present in revision {1}"
2061
#: bzrlib/builtins.py:3441
2062
msgid "Commit changes into a new revision."
2065
#: bzrlib/builtins.py:3443
2067
"An explanatory message needs to be given for each commit. This is\n"
2068
"often done by using the --message option (getting the message from the\n"
2069
"command line) or by using the --file option (getting the message from\n"
2070
"a file). If neither of these options is given, an editor is opened for\n"
2071
"the user to enter the message. To see the changed files in the\n"
2072
"boilerplate text loaded into the editor, use the --show-diff option."
2075
#: bzrlib/builtins.py:3450
2077
"By default, the entire tree is committed and the person doing the\n"
2078
"commit is assumed to be the author. These defaults can be overridden\n"
2079
"as explained below."
2082
#: bzrlib/builtins.py:3454
2083
msgid ":Selective commits:"
2086
#: bzrlib/builtins.py:3456
2088
" If selected files are specified, only changes to those files are\n"
2089
" committed. If a directory is specified then the directory and\n"
2090
" everything within it is committed."
2093
#: bzrlib/builtins.py:3460
2095
" When excludes are given, they take precedence over selected files.\n"
2096
" For example, to commit only changes within foo, but not changes\n"
2100
#: bzrlib/builtins.py:3464
2101
msgid " bzr commit foo -x foo/bar"
2104
#: bzrlib/builtins.py:3466
2105
msgid " A selective commit after a merge is not yet supported."
2108
#: bzrlib/builtins.py:3468
2109
msgid ":Custom authors:"
2112
#: bzrlib/builtins.py:3470
2114
" If the author of the change is not the same person as the committer,\n"
2115
" you can specify the author's name using the --author option. The\n"
2116
" name should be in the same format as a committer-id, e.g.\n"
2117
" \"John Doe <jdoe@example.com>\". If there is more than one author of\n"
2118
" the change you can specify the option multiple times, once for each\n"
2122
#: bzrlib/builtins.py:3477
2126
#: bzrlib/builtins.py:3479
2128
" A common mistake is to forget to add a new file or directory before\n"
2129
" running the commit command. The --strict option checks for unknown\n"
2130
" files and aborts the commit if any are found. More advanced pre-commit\n"
2131
" checks can be implemented by defining hooks. See ``bzr help hooks``\n"
2135
#: bzrlib/builtins.py:3485
2136
msgid ":Things to note:"
2139
#: bzrlib/builtins.py:3487
2141
" If you accidentially commit the wrong changes or make a spelling\n"
2142
" mistake in the commit message say, you can use the uncommit command\n"
2143
" to undo it. See ``bzr help uncommit`` for details."
2146
#: bzrlib/builtins.py:3491
2148
" Hooks can also be configured to run after a commit. This allows you\n"
2149
" to trigger updates to external systems like bug trackers. The --fixes\n"
2150
" option can be used to record the association between a revision and\n"
2151
" one or more bugs. See ``bzr help bugs`` for details."
2154
#: bzrlib/builtins.py:3501
2155
msgid "Do not consider changes made to a given path."
2158
#: bzrlib/builtins.py:3504
2159
msgid "Description of the new revision."
2162
#: bzrlib/builtins.py:3507
2163
msgid "Commit even if nothing has changed."
2166
#: bzrlib/builtins.py:3511
2167
msgid "Take commit message from this file."
2170
#: bzrlib/builtins.py:3513
2171
msgid "Refuse to commit if there are unknown files in the working tree."
2174
#: bzrlib/builtins.py:3516
2176
"Manually set a commit time using commit date format, e.g. '2009-10-10 "
2180
#: bzrlib/builtins.py:3519
2181
msgid "Mark a bug as being fixed by this revision (see \"bzr help bugs\")."
2184
#: bzrlib/builtins.py:3522
2185
msgid "Set the author's name, if it's different from the committer."
2188
#: bzrlib/builtins.py:3525
2190
"Perform a local commit in a bound branch. Local commits are not pushed to "
2191
"the master branch until a normal commit is performed."
2194
#: bzrlib/builtins.py:3531
2196
"When no message is supplied, show the diff along with the status summary in "
2197
"the message editor."
2200
#: bzrlib/builtins.py:3534
2202
"When committing to a foreign version control system do not push data that "
2203
"can not be natively represented."
2206
#: bzrlib/builtins.py:3552
2209
"No tracker specified for bug %s. Use the form 'tracker:id' or specify a "
2210
"default bug tracker using the `bugtracker` option.\n"
2211
"See \"bzr help bugs\" for more information on this feature. Commit refused."
2214
#: bzrlib/builtins.py:3561
2217
"Invalid bug %s. Must be in the form of 'tracker:id'. See \"bzr help bugs\" "
2218
"for more information on this feature.\n"
2222
#: bzrlib/builtins.py:3570
2224
msgid "Unrecognized bug %s. Commit refused."
2227
#: bzrlib/builtins.py:3573
2234
#: bzrlib/builtins.py:3597
2235
msgid "Could not parse --commit-time: "
2238
#: bzrlib/builtins.py:3637
2239
msgid "please specify either --message or --file"
2242
#: bzrlib/builtins.py:3666
2243
msgid "please specify a commit message with either --message or --file"
2246
#: bzrlib/builtins.py:3669
2248
"Empty commit message specified. Please specify a commit message with either -"
2249
"-message or --file or leave a blank message with --message \"\"."
2252
#: bzrlib/builtins.py:3689
2254
"No changes to commit. Please 'bzr add' the files you want to commit, or use -"
2255
"-unchanged to force an empty commit."
2258
#: bzrlib/builtins.py:3693
2260
"Conflicts detected in working tree. Use \"bzr conflicts\" to list, \"bzr "
2261
"resolve FILE\" to resolve."
2264
#: bzrlib/builtins.py:3697
2265
msgid "Commit refused because there are unknown files in the working tree."
2268
#: bzrlib/builtins.py:3700
2271
"To commit to master branch, run update and then commit.\n"
2272
"You can also pass --local to commit to continue working disconnected."
2275
#: bzrlib/builtins.py:3708
2277
"Validate working tree structure, branch consistency and repository history."
2280
#: bzrlib/builtins.py:3710
2282
"This command checks various invariants about branch and repository storage\n"
2283
"to detect data corruption or bzr bugs."
2286
#: bzrlib/builtins.py:3713
2288
"The working tree and branch checks will only give output if a problem is\n"
2289
"detected. The output fields of the repository check are:"
2292
#: bzrlib/builtins.py:3716
2295
" This is just the number of revisions checked. It doesn't\n"
2296
" indicate a problem."
2299
#: bzrlib/builtins.py:3720
2302
" This is just the number of versionedfiles checked. It\n"
2303
" doesn't indicate a problem."
2306
#: bzrlib/builtins.py:3724
2308
"unreferenced ancestors\n"
2309
" Texts that are ancestors of other texts, but\n"
2310
" are not properly referenced by the revision ancestry. This is a\n"
2311
" subtle problem that Bazaar can work around."
2314
#: bzrlib/builtins.py:3729
2316
"unique file texts\n"
2317
" This is the total number of unique file contents\n"
2318
" seen in the checked revisions. It does not indicate a problem."
2321
#: bzrlib/builtins.py:3733
2323
"repeated file texts\n"
2324
" This is the total number of repeated texts seen\n"
2325
" in the checked revisions. Texts can be repeated when their file\n"
2326
" entries are modified, but the file contents are not. It does not\n"
2327
" indicate a problem."
2330
#: bzrlib/builtins.py:3739
2332
"If no restrictions are specified, all Bazaar data that is found at the "
2334
"location will be checked."
2337
#: bzrlib/builtins.py:3744
2338
msgid " Check the tree and branch at 'foo'::"
2341
#: bzrlib/builtins.py:3746
2342
msgid " bzr check --tree --branch foo"
2345
#: bzrlib/builtins.py:3748
2346
msgid " Check only the repository at 'bar'::"
2349
#: bzrlib/builtins.py:3750
2350
msgid " bzr check --repo bar"
2353
#: bzrlib/builtins.py:3752
2354
msgid " Check everything at 'baz'::"
2357
#: bzrlib/builtins.py:3754
2358
msgid " bzr check baz"
2361
#: bzrlib/builtins.py:3760
2362
msgid "Check the branch related to the current directory."
2365
#: bzrlib/builtins.py:3762
2366
msgid "Check the repository related to the current directory."
2369
#: bzrlib/builtins.py:3764
2370
msgid "Check the working tree related to the current directory."
2373
#: bzrlib/builtins.py:3778
2374
msgid "Upgrade a repository, branch or working tree to a newer format."
2377
#: bzrlib/builtins.py:3780
2379
"When the default format has changed after a major new release of\n"
2380
"Bazaar, you may be informed during certain operations that you\n"
2381
"should upgrade. Upgrading to a newer format may improve performance\n"
2382
"or make new features available. It may however limit interoperability\n"
2383
"with older repositories or with older versions of Bazaar."
2386
#: bzrlib/builtins.py:3786
2388
"If you wish to upgrade to a particular format rather than the\n"
2389
"current default, that can be specified using the --format option.\n"
2390
"As a consequence, you can use the upgrade command this way to\n"
2391
"\"downgrade\" to an earlier format, though some conversions are\n"
2392
"a one way process (e.g. changing from the 1.x default to the\n"
2393
"2.x default) so downgrading is not always possible."
2396
#: bzrlib/builtins.py:3793
2398
"A backup.bzr.~#~ directory is created at the start of the conversion\n"
2399
"process (where # is a number). By default, this is left there on\n"
2400
"completion. If the conversion fails, delete the new .bzr directory\n"
2401
"and rename this one back in its place. Use the --clean option to ask\n"
2402
"for the backup.bzr directory to be removed on successful conversion.\n"
2403
"Alternatively, you can delete it by hand if everything looks good\n"
2407
#: bzrlib/builtins.py:3801
2409
"If the location given is a shared repository, dependent branches\n"
2410
"are also converted provided the repository converts successfully.\n"
2411
"If the conversion of a branch fails, remaining branches are still\n"
2415
#: bzrlib/builtins.py:3806
2417
"For more information on upgrades, see the Bazaar Upgrade Guide,\n"
2418
"http://doc.bazaar.canonical.com/latest/en/upgrade-guide/."
2421
#: bzrlib/builtins.py:3814
2422
msgid "Upgrade to a specific format. See \"bzr help formats\" for details."
2425
#: bzrlib/builtins.py:3818
2426
msgid "Branch format"
2429
#: bzrlib/builtins.py:3820
2430
msgid "Remove the backup.bzr directory if successful."
2433
#: bzrlib/builtins.py:3822
2434
msgid "Show what would be done, but don't actually do anything."
2437
#: bzrlib/builtins.py:3837
2438
msgid "Show or set bzr user id."
2441
#: bzrlib/builtins.py:3839
2444
" Show the email of the current user::"
2447
#: bzrlib/builtins.py:3842
2448
msgid " bzr whoami --email"
2451
#: bzrlib/builtins.py:3844
2452
msgid " Set the current user::"
2455
#: bzrlib/builtins.py:3846
2456
msgid " bzr whoami \"Frank Chu <fchu@example.com>\""
2459
#: bzrlib/builtins.py:3850
2460
msgid "Display email address only."
2463
#: bzrlib/builtins.py:3852
2464
msgid "Set identity for the current branch instead of globally."
2467
#: bzrlib/builtins.py:3878
2468
msgid "--email can only be used to display existing identity"
2471
#: bzrlib/builtins.py:3902
2472
msgid "Print or set the branch nickname."
2475
#: bzrlib/builtins.py:3904
2477
"If unset, the colocated branch name is used for colocated branches, and\n"
2478
"the branch directory name is used for other branches. To print the\n"
2479
"current nickname, execute with no argument."
2482
#: bzrlib/builtins.py:3908
2484
"Bound branches use the nickname of its master branch unless it is set\n"
2488
#: bzrlib/builtins.py:3928
2489
msgid "Set/unset and display aliases."
2492
#: bzrlib/builtins.py:3930
2495
" Show the current aliases::"
2498
#: bzrlib/builtins.py:3933
2502
#: bzrlib/builtins.py:3935
2503
msgid " Show the alias specified for 'll'::"
2506
#: bzrlib/builtins.py:3937
2507
msgid " bzr alias ll"
2510
#: bzrlib/builtins.py:3939
2511
msgid " Set an alias for 'll'::"
2514
#: bzrlib/builtins.py:3941
2515
msgid " bzr alias ll=\"log --line -r-10..-1\""
2518
#: bzrlib/builtins.py:3943
2519
msgid " To remove an alias for 'll'::"
2522
#: bzrlib/builtins.py:3945
2523
msgid " bzr alias --remove ll"
2526
#: bzrlib/builtins.py:3950
2527
msgid "Remove the alias."
2530
#: bzrlib/builtins.py:3968
2531
msgid "bzr alias --remove expects an alias to remove."
2534
#: bzrlib/builtins.py:4149
2536
"subunit not available. subunit needs to be installed to use --subunit."
2539
#: bzrlib/builtins.py:4166
2541
"--benchmark is no longer supported from bzr 2.2; use bzr-usertest instead"
2544
#: bzrlib/builtins.py:4213
2545
msgid "Show version of bzr."
2548
#: bzrlib/builtins.py:4217
2549
msgid "Print just the version number."
2552
#: bzrlib/builtins.py:4236
2553
msgid "It sure does!\n"
2556
#: bzrlib/builtins.py:4260
2558
msgid "merge base is revision %s\n"
2561
#: bzrlib/builtins.py:4264
2562
msgid "Perform a three-way merge."
2565
#: bzrlib/builtins.py:4266
2567
"The source of the merge can be specified either in the form of a branch,\n"
2568
"or in the form of a path to a file containing a merge directive generated\n"
2569
"with bzr send. If neither is specified, the default is the upstream branch\n"
2570
"or the branch most recently merged using --remember. The source of the\n"
2571
"merge may also be specified in the form of a path to a file in another\n"
2572
"branch: in this case, only the modifications to that file are merged into\n"
2573
"the current working tree."
2576
#: bzrlib/builtins.py:4274
2578
"When merging from a branch, by default bzr will try to merge in all new\n"
2579
"work from the other branch, automatically determining an appropriate base\n"
2580
"revision. If this fails, you may need to give an explicit base."
2583
#: bzrlib/builtins.py:4278
2585
"To pick a different ending revision, pass \"--revision OTHER\". bzr will\n"
2586
"try to merge in all new work up to and including revision OTHER."
2589
#: bzrlib/builtins.py:4281
2591
"If you specify two values, \"--revision BASE..OTHER\", only revisions BASE\n"
2592
"through OTHER, excluding BASE but including OTHER, will be merged. If this\n"
2593
"causes some revisions to be skipped, i.e. if the destination branch does\n"
2594
"not already contain revision BASE, such a merge is commonly referred to as\n"
2595
"a \"cherrypick\". Unlike a normal merge, Bazaar does not currently track\n"
2596
"cherrypicks. The changes look like a normal commit, and the history of the\n"
2597
"changes from the other branch is not stored in the commit."
2600
#: bzrlib/builtins.py:4289
2601
msgid "Revision numbers are always relative to the source branch."
2604
#: bzrlib/builtins.py:4291 bzrlib/conflicts.py:52 bzrlib/conflicts.py:106
2606
"Merge will do its best to combine the changes in two branches, but there\n"
2607
"are some kinds of problems only a human can fix. When it encounters those,\n"
2608
"it will mark a conflict. A conflict means that you need to fix something,\n"
2609
"before you can commit."
2612
#: bzrlib/builtins.py:4296
2614
"Use bzr resolve when you have fixed a problem. See also bzr conflicts."
2617
#: bzrlib/builtins.py:4298
2619
"If there is no default branch set, the first merge will set it (use\n"
2620
"--no-remember to avoid setting it). After that, you can omit the branch\n"
2621
"to use the default. To change the default, use --remember. The value will\n"
2622
"only be saved if the remote location can be accessed."
2625
#: bzrlib/builtins.py:4303
2627
"The results of the merge are placed into the destination working\n"
2628
"directory, where they can be reviewed (with bzr diff), tested, and then\n"
2629
"committed to record the result of the merge."
2632
#: bzrlib/builtins.py:4307
2634
"merge refuses to run if there are any uncommitted changes, unless\n"
2635
"--force is given. If --force is given, then the changes from the source \n"
2636
"will be merged with the current working tree, including any uncommitted\n"
2637
"changes in the tree. The --force option can also be used to create a\n"
2638
"merge revision which has more than two parents."
2641
#: bzrlib/builtins.py:4313
2643
"If one would like to merge changes from the working tree of the other\n"
2644
"branch without merging any committed revisions, the --uncommitted option\n"
2648
#: bzrlib/builtins.py:4317
2650
"To select only some changes to merge, use \"merge -i\", which will prompt\n"
2651
"you to apply each diff hunk and file change, similar to \"shelve\"."
2654
#: bzrlib/builtins.py:4320
2657
" To merge all new revisions from bzr.dev::"
2660
#: bzrlib/builtins.py:4323
2661
msgid " bzr merge ../bzr.dev"
2664
#: bzrlib/builtins.py:4325
2665
msgid " To merge changes up to and including revision 82 from bzr.dev::"
2668
#: bzrlib/builtins.py:4327
2669
msgid " bzr merge -r 82 ../bzr.dev"
2672
#: bzrlib/builtins.py:4329
2673
msgid " To merge the changes introduced by 82, without previous changes::"
2676
#: bzrlib/builtins.py:4331
2677
msgid " bzr merge -r 81..82 ../bzr.dev"
2680
#: bzrlib/builtins.py:4333
2681
msgid " To apply a merge directive contained in /tmp/merge::"
2684
#: bzrlib/builtins.py:4335
2685
msgid " bzr merge /tmp/merge"
2688
#: bzrlib/builtins.py:4337
2690
" To create a merge revision with three parents from two branches\n"
2691
" feature1a and feature1b:"
2694
#: bzrlib/builtins.py:4340
2696
" bzr merge ../feature1a\n"
2697
" bzr merge ../feature1b --force\n"
2698
" bzr commit -m 'revision with three parents'"
2701
#: bzrlib/builtins.py:4352
2702
msgid "Merge even if the destination tree has uncommitted changes."
2705
#: bzrlib/builtins.py:4358
2707
"Apply uncommitted changes from a working copy, instead of branch changes."
2710
#: bzrlib/builtins.py:4360
2712
"If the destination is already completely merged into the source, pull from "
2713
"the source rather than merging. When this happens, you do not need to "
2714
"commit the result."
2717
#: bzrlib/builtins.py:4365
2719
"Branch to merge into, rather than the one containing the working directory."
2722
#: bzrlib/builtins.py:4367
2723
msgid "Instead of merging, show a diff of the merge."
2726
#: bzrlib/builtins.py:4369
2727
msgid "Select changes interactively."
2730
#: bzrlib/builtins.py:4391
2732
"Merging into empty branches not currently supported, "
2733
"https://bugs.launchpad.net/bzr/+bug/308562"
2736
#: bzrlib/builtins.py:4418
2737
msgid "Cannot use --uncommitted with bundles or merge directives."
2740
#: bzrlib/builtins.py:4429
2741
msgid "Cannot use --uncommitted and --revision at the same time."
2744
#: bzrlib/builtins.py:4449
2748
#: bzrlib/builtins.py:4451 bzrlib/bundle/apply_bundle.py:71
2749
msgid "Nothing to do."
2752
#: bzrlib/builtins.py:4455
2753
msgid "Cannot pull individual files"
2756
#: bzrlib/builtins.py:4463
2757
msgid "This branch has no commits. (perhaps you would prefer 'bzr pull')"
2760
#: bzrlib/builtins.py:4521
2762
msgid "Show-base is not supported for this merge type. %s"
2765
#: bzrlib/builtins.py:4530
2767
msgid "Conflict reduction is not supported for merge type %s."
2770
#: bzrlib/builtins.py:4534
2771
msgid "Cannot do conflict reduction and show base."
2774
#: bzrlib/builtins.py:4645
2775
msgid "No location specified or remembered"
2778
#: bzrlib/builtins.py:4647
2779
msgid "{0} remembered {1} location {2}"
2782
#: bzrlib/builtins.py:4653
2783
msgid "Redo a merge."
2786
#: bzrlib/builtins.py:4655
2788
"Use this if you want to try a different merge technique while resolving\n"
2789
"conflicts. Some merge techniques are better than others, and remerge\n"
2790
"lets you try different ones on different files."
2793
#: bzrlib/builtins.py:4659
2795
"The options for remerge have the same meaning and defaults as the ones for\n"
2796
"merge. The difference is that remerge can (only) be run when there is a\n"
2797
"pending merge, and it lets you specify particular files."
2800
#: bzrlib/builtins.py:4663
2803
" Re-do the merge of all conflicted files, and show the base text in\n"
2804
" conflict regions, in addition to the usual THIS and OTHER texts::"
2807
#: bzrlib/builtins.py:4667
2808
msgid " bzr remerge --show-base"
2811
#: bzrlib/builtins.py:4669
2813
" Re-do the merge of \"foobar\", using the weave merge algorithm, with\n"
2814
" additional processing to reduce the size of conflict regions::"
2817
#: bzrlib/builtins.py:4672
2818
msgid " bzr remerge --merge-type weave --reprocess foobar"
2821
#: bzrlib/builtins.py:4679
2822
msgid "Show base revision text in conflicts."
2825
#: bzrlib/builtins.py:4691
2827
"Sorry, remerge only works after normal merges. Not cherrypicking or multi-"
2831
#: bzrlib/builtins.py:4749
2833
"Set files in the working tree back to the contents of a previous revision."
2836
#: bzrlib/builtins.py:4751
2838
"Giving a list of files will revert only those files. Otherwise, all files\n"
2839
"will be reverted. If the revision is not specified with '--revision', the\n"
2840
"working tree basis revision is used. A revert operation affects only the\n"
2841
"working tree, not any revision history like the branch and repository or\n"
2842
"the working tree basis revision."
2845
#: bzrlib/builtins.py:4757
2847
"To remove only some changes, without reverting to a prior version, use\n"
2848
"merge instead. For example, \"merge . -r -2..-3\" (don't forget the \".\")\n"
2849
"will remove the changes introduced by the second last commit (-2), without\n"
2850
"affecting the changes introduced by the last commit (-1). To remove\n"
2851
"certain changes on a hunk-by-hunk basis, see the shelve command.\n"
2852
"To update the branch to a specific revision or the latest revision and\n"
2853
"update the working tree accordingly while preserving local changes, see the\n"
2857
#: bzrlib/builtins.py:4766
2859
"Uncommitted changes to files that are reverted will be discarded.\n"
2860
"Howver, by default, any files that have been manually changed will be\n"
2861
"backed up first. (Files changed only by merge are not backed up.) Backup\n"
2862
"files have '.~#~' appended to their name, where # is a number."
2865
#: bzrlib/builtins.py:4771
2867
"When you provide files, you can use their current pathname or the pathname\n"
2868
"from the target revision. So you can use revert to \"undelete\" a file by\n"
2869
"name. If you name a directory, all the contents of that directory will be\n"
2873
#: bzrlib/builtins.py:4776
2875
"If you have newly added files since the target revision, they will be\n"
2876
"removed. If the files to be removed have been changed, backups will be\n"
2877
"created as above. Directories containing unknown files will not be\n"
2881
#: bzrlib/builtins.py:4781
2883
"The working tree contains a list of revisions that have been merged but\n"
2884
"not yet committed. These revisions will be included as additional parents\n"
2885
"of the next commit. Normally, using revert clears that list as well as\n"
2886
"reverting the files. If any files are specified, revert leaves the list\n"
2887
"of uncommitted merges alone and reverts only the files. Use ``bzr revert\n"
2888
".`` in the tree root to revert all files but keep the recorded merges,\n"
2889
"and ``bzr revert --forget-merges`` to clear the pending merge list without\n"
2890
"reverting any files."
2893
#: bzrlib/builtins.py:4790
2895
"Using \"bzr revert --forget-merges\", it is possible to apply all of the\n"
2896
"changes from a branch in a single revision. To do this, perform the merge\n"
2897
"as desired. Then doing revert with the \"--forget-merges\" option will "
2899
"the content of the tree as it was, but it will clear the list of pending\n"
2900
"merges. The next commit will then contain all of the changes that are\n"
2901
"present in the other branch, but without any other parent revisions.\n"
2902
"Because this technique forgets where these changes originated, it may\n"
2903
"cause additional conflicts on later merges involving the same source and\n"
2907
#: bzrlib/builtins.py:4804
2908
msgid "Do not save backups of reverted files."
2911
#: bzrlib/builtins.py:4806
2912
msgid "Remove pending merge marker, without changing any files."
2915
#: bzrlib/builtins.py:4837
2917
"Show help on a command or other topic.\n"
2921
#: bzrlib/builtins.py:4842
2922
msgid "Show help on all commands."
2925
#: bzrlib/builtins.py:4871
2926
msgid "Show unmerged/unpulled revisions between two branches."
2929
#: bzrlib/builtins.py:4873
2930
msgid "OTHER_BRANCH may be local or remote."
2933
#: bzrlib/builtins.py:4875
2935
"To filter on a range of revisions, you can use the command -r begin..end\n"
2936
"-r revision requests a specific revision, -r ..end or -r begin.. are\n"
2940
" 1 - some missing revisions\n"
2941
" 0 - no missing revisions"
2944
#: bzrlib/builtins.py:4885
2946
" Determine the missing revisions between this and the branch at the\n"
2947
" remembered pull location::"
2950
#: bzrlib/builtins.py:4888
2951
msgid " bzr missing"
2954
#: bzrlib/builtins.py:4890
2955
msgid " Determine the missing revisions between this and another branch::"
2958
#: bzrlib/builtins.py:4892
2959
msgid " bzr missing http://server/branch"
2962
#: bzrlib/builtins.py:4894
2964
" Determine the missing revisions up to a specific revision on the other\n"
2968
#: bzrlib/builtins.py:4897
2969
msgid " bzr missing -r ..-10"
2972
#: bzrlib/builtins.py:4899
2974
" Determine the missing revisions up to a specific revision on this\n"
2978
#: bzrlib/builtins.py:4902
2979
msgid " bzr missing --my-revision ..-10"
2982
#: bzrlib/builtins.py:4909
2983
msgid "Reverse the order of revisions."
2986
#: bzrlib/builtins.py:4911
2987
msgid "Display changes in the local branch only."
2990
#: bzrlib/builtins.py:4912
2991
msgid "Same as --mine-only."
2994
#: bzrlib/builtins.py:4914
2995
msgid "Display changes in the remote branch only."
2998
#: bzrlib/builtins.py:4915
2999
msgid "Same as --theirs-only."
3002
#: bzrlib/builtins.py:4920
3004
"Filter on other branch revisions (inclusive). See \"help revisionspec\" for "
3008
#: bzrlib/builtins.py:4924
3010
"Filter on local branch revisions (inclusive). See \"help revisionspec\" for "
3014
#: bzrlib/builtins.py:4927
3015
msgid "Show all revisions in addition to the mainline ones."
3018
#: bzrlib/builtins.py:4981
3019
msgid "No peer location known or specified."
3022
#: bzrlib/builtins.py:4985
3023
msgid "Using saved parent location: {0}\n"
3026
#: bzrlib/builtins.py:5018
3028
msgid "You have %d extra revision:\n"
3029
msgid_plural "You have %d extra revisions:\n"
3033
#: bzrlib/builtins.py:5038
3035
msgid "You are missing %d revision:\n"
3036
msgid_plural "You are missing %d revisions:\n"
3040
#: bzrlib/builtins.py:5053
3041
msgid "This branch has no new revisions.\n"
3044
#: bzrlib/builtins.py:5056
3045
msgid "Other branch has no new revisions.\n"
3048
#: bzrlib/builtins.py:5061
3049
msgid "Branches are up to date.\n"
3052
#: bzrlib/builtins.py:5072
3053
msgid "Compress the data within a repository."
3056
#: bzrlib/builtins.py:5074
3058
"This operation compresses the data within a bazaar repository. As\n"
3059
"bazaar supports automatic packing of repository, this operation is\n"
3060
"normally not required to be done manually."
3063
#: bzrlib/builtins.py:5078
3065
"During the pack operation, bazaar takes a backup of existing repository\n"
3066
"data, i.e. pack files. This backup is eventually removed by bazaar\n"
3067
"automatically when it is safe to do so. To save disk space by removing\n"
3068
"the backed up pack files, the --clean-obsolete-packs option may be\n"
3072
#: bzrlib/builtins.py:5084
3074
"Warning: If you use --clean-obsolete-packs and your machine crashes\n"
3075
"during or immediately after repacking, you may be left with a state\n"
3076
"where the deletion has been written to disk but the new packs have not\n"
3077
"been. In this case the repository may be unusable."
3080
#: bzrlib/builtins.py:5093
3081
msgid "Delete obsolete packs to save disk space."
3084
#: bzrlib/builtins.py:5107
3085
msgid "List the installed plugins."
3088
#: bzrlib/builtins.py:5109
3090
"This command displays the list of installed plugins including\n"
3091
"version of plugin and a short description of each."
3094
#: bzrlib/builtins.py:5112
3095
msgid "--verbose shows the path where each plugin is located."
3098
#: bzrlib/builtins.py:5114
3100
"A plugin is an external component for Bazaar that extends the\n"
3101
"revision control system, by adding or replacing code in Bazaar.\n"
3102
"Plugins can do a variety of things, including overriding commands,\n"
3103
"adding new commands, providing additional network transports and\n"
3104
"customizing log output."
3107
#: bzrlib/builtins.py:5120
3109
"See the Bazaar Plugin Guide <http://doc.bazaar.canonical.com/plugins/en/>\n"
3110
"for further information on plugins including where to find them and how to\n"
3111
"install them. Instructions are also provided there on how to write new\n"
3112
"plugins using the Python programming language."
3115
#: bzrlib/builtins.py:5136
3116
msgid "Show testament (signing-form) of a revision."
3119
#: bzrlib/builtins.py:5139
3120
msgid "Produce long-format testament."
3123
#: bzrlib/builtins.py:5141
3124
msgid "Produce a strict-format testament."
3127
#: bzrlib/builtins.py:5168
3128
msgid "Show the origin of each line in a file."
3131
#: bzrlib/builtins.py:5170
3133
"This prints out the given file with an annotation on the left side\n"
3134
"indicating which revision, author and date introduced the change."
3137
#: bzrlib/builtins.py:5173
3139
"If the origin is the same for a run of consecutive lines, it is\n"
3140
"shown only at the top, unless the --all option is given."
3143
#: bzrlib/builtins.py:5181
3144
msgid "Show annotations on all lines."
3147
#: bzrlib/builtins.py:5182
3148
msgid "Show commit date in annotations."
3151
#: bzrlib/builtins.py:5269
3152
msgid "Cannot sign a range of non-revision-history revisions"
3155
#: bzrlib/builtins.py:5281
3156
msgid "Please supply either one revision, or a range."
3159
#: bzrlib/builtins.py:5285
3161
"Convert the current branch into a checkout of the supplied branch.\n"
3162
"If no branch is supplied, rebind to the last bound location."
3165
#: bzrlib/builtins.py:5288
3167
"Once converted into a checkout, commits must succeed on the master branch\n"
3168
"before they will be applied to the local branch."
3171
#: bzrlib/builtins.py:5291
3173
"Bound branches use the nickname of its master branch unless it is set\n"
3174
"locally, in which case binding will update the local nickname to be\n"
3175
"that of the master."
3178
#: bzrlib/builtins.py:5306
3179
msgid "No location supplied. This format does not remember old locations."
3182
#: bzrlib/builtins.py:5312
3183
msgid "Branch is already bound"
3186
#: bzrlib/builtins.py:5315
3187
msgid "No location supplied and no previous location known"
3190
#: bzrlib/builtins.py:5321
3191
msgid "These branches have diverged. Try merging, and then bind again."
3194
#: bzrlib/builtins.py:5328
3195
msgid "Convert the current checkout into a regular branch."
3198
#: bzrlib/builtins.py:5330
3200
"After unbinding, the local branch is considered independent and subsequent\n"
3201
"commits will be local only."
3204
#: bzrlib/builtins.py:5341
3205
msgid "Local branch is not bound"
3208
#: bzrlib/builtins.py:5345
3209
msgid "Remove the last committed revision."
3212
#: bzrlib/builtins.py:5347
3214
"--verbose will print out what is being removed.\n"
3215
"--dry-run will go through all the motions, but not actually\n"
3219
#: bzrlib/builtins.py:5351
3221
"If --revision is specified, uncommit revisions to leave the branch at the\n"
3222
"specified revision. For example, \"bzr uncommit -r 15\" will leave the\n"
3223
"branch at revision 15."
3226
#: bzrlib/builtins.py:5355
3228
"Uncommit leaves the working tree ready for a new commit. The only change\n"
3229
"it may make is to restore any pending merges that were present before\n"
3233
#: bzrlib/builtins.py:5366
3234
msgid "Don't actually make changes."
3237
#: bzrlib/builtins.py:5367
3238
msgid "Say yes to all questions."
3241
#: bzrlib/builtins.py:5369
3242
msgid "Keep tags that point to removed revisions."
3245
#: bzrlib/builtins.py:5371
3246
msgid "Only remove the commits from the local branch when in a checkout."
3249
#: bzrlib/builtins.py:5420
3250
msgid "No revisions to uncommit.\n"
3253
#: bzrlib/builtins.py:5435
3254
msgid "Dry-run, pretending to remove the above revisions.\n"
3257
#: bzrlib/builtins.py:5438
3258
msgid "The above revision(s) will be removed.\n"
3261
#: bzrlib/builtins.py:5442
3262
msgid "Uncommit these revisions"
3265
#: bzrlib/builtins.py:5445
3269
#: bzrlib/builtins.py:5452
3272
"You can restore the old tip by running:\n"
3273
" bzr pull . -r revid:%s\n"
3276
#: bzrlib/builtins.py:5457
3277
msgid "Break a dead lock."
3280
#: bzrlib/builtins.py:5459
3282
"This command breaks a lock on a repository, branch, working directory or\n"
3286
#: bzrlib/builtins.py:5462
3288
"CAUTION: Locks should only be broken when you are sure that the process\n"
3289
"holding the lock has been stopped."
3292
#: bzrlib/builtins.py:5465
3294
"You can get information on what locks are open via the 'bzr info\n"
3295
"[location]' command."
3298
#: bzrlib/builtins.py:5468
3302
" bzr break-lock bzr+ssh://example.com/bzr/foo\n"
3303
" bzr break-lock --conf ~/.bazaar"
3306
#: bzrlib/builtins.py:5477
3307
msgid "LOCATION is the directory where the config lock is."
3310
#: bzrlib/builtins.py:5479
3311
msgid "Do not ask for confirmation before breaking the lock."
3314
#: bzrlib/builtins.py:5514
3315
msgid "The Bazaar smart server protocol over TCP. (default port: 4155)"
3318
#: bzrlib/builtins.py:5515
3319
msgid "Run the bzr server."
3322
#: bzrlib/builtins.py:5521
3323
msgid "Serve on stdin/out for use from inetd or sshd."
3326
#: bzrlib/builtins.py:5522
3330
#: bzrlib/builtins.py:5523
3331
msgid "Protocol to serve."
3334
#: bzrlib/builtins.py:5527
3335
msgid "Listen for connections on nominated address."
3338
#: bzrlib/builtins.py:5529
3340
"Listen for connections on nominated port. Passing 0 as the port number will "
3341
"result in a dynamically allocated port. The default port depends on the "
3345
#: bzrlib/builtins.py:5534
3346
msgid "Serve contents of this directory."
3349
#: bzrlib/builtins.py:5536
3351
"By default the server is a readonly server. Supplying --allow-writes "
3352
"enables write access to the contents of the served directory and below. "
3353
"Note that ``bzr serve`` does not perform authentication, so unless some form "
3354
"of external authentication is arranged supplying this option leads to global "
3355
"uncontrolled write access to your file system."
3358
#: bzrlib/builtins.py:5545
3359
msgid "Override the default idle client timeout (5min)."
3362
#: bzrlib/builtins.py:5563
3363
msgid "Combine a tree into its containing tree."
3366
#: bzrlib/builtins.py:5565
3367
msgid "This command requires the target tree to be in a rich-root format."
3370
#: bzrlib/builtins.py:5567
3372
"The TREE argument should be an independent tree, inside another tree, but\n"
3373
"not part of it. (Such trees can be produced by \"bzr split\", but also by\n"
3374
"running \"bzr branch\" with the target inside a tree.)"
3377
#: bzrlib/builtins.py:5571
3379
"The result is a combined tree, with the subtree no longer an independent\n"
3380
"part. This is marked as a merge of the subtree into the containing tree,\n"
3381
"and all history is preserved."
3384
#: bzrlib/builtins.py:5589
3387
"Can't join trees because %s doesn't support rich root data.\n"
3388
"You can use bzr upgrade on the repository."
3391
#: bzrlib/builtins.py:5599 bzrlib/builtins.py:5605
3392
msgid "Cannot join {0}. {1}"
3395
#: bzrlib/builtins.py:5609
3396
msgid "Split a subdirectory of a tree into a separate tree."
3399
#: bzrlib/builtins.py:5611
3401
"This command will produce a target tree in a format that supports\n"
3402
"rich roots, like 'rich-root' or 'rich-root-pack'. These formats cannot be\n"
3403
"converted into earlier formats like 'dirstate-tags'."
3406
#: bzrlib/builtins.py:5615
3408
"The TREE argument should be a subdirectory of a working tree. That\n"
3409
"subdirectory will be converted into an independent tree, with its own\n"
3410
"branch. Commits in the top-level tree will not apply to the new subtree."
3413
#: bzrlib/builtins.py:5695
3414
msgid "No submit branch specified or known"
3417
#: bzrlib/builtins.py:5704 bzrlib/send.py:109
3418
msgid "No public branch specified or known"
3421
#: bzrlib/builtins.py:5709
3422
msgid "bzr merge-directive takes at most two one revision identifiers"
3425
#: bzrlib/builtins.py:5718
3426
msgid "No revisions to bundle."
3429
#: bzrlib/builtins.py:5737
3430
msgid "Mail or create a merge-directive for submitting changes."
3433
#: bzrlib/builtins.py:5739
3434
msgid "A merge directive provides many things needed for requesting merges:"
3437
#: bzrlib/builtins.py:5741
3438
msgid "* A machine-readable description of the merge to perform"
3441
#: bzrlib/builtins.py:5743
3442
msgid "* An optional patch that is a preview of the changes requested"
3445
#: bzrlib/builtins.py:5745
3447
"* An optional bundle of revision data, so that the changes can be applied\n"
3448
" directly from the merge directive, without retrieving data from a\n"
3452
#: bzrlib/builtins.py:5749
3454
"`bzr send` creates a compact data set that, when applied using bzr\n"
3455
"merge, has the same effect as merging from the source branch. "
3458
#: bzrlib/builtins.py:5752
3460
"By default the merge directive is self-contained and can be applied to any\n"
3461
"branch containing submit_branch in its ancestory without needing access to\n"
3462
"the source branch."
3465
#: bzrlib/builtins.py:5756
3467
"If --no-bundle is specified, then Bazaar doesn't send the contents of the\n"
3468
"revisions, but only a structured request to merge from the\n"
3469
"public_location. In that case the public_branch is needed and it must be\n"
3470
"up-to-date and accessible to the recipient. The public_branch is always\n"
3471
"included if known, so that people can check it later."
3474
#: bzrlib/builtins.py:5762
3476
"The submit branch defaults to the parent of the source branch, but can be\n"
3477
"overridden. Both submit branch and public branch will be remembered in\n"
3478
"branch.conf the first time they are used for a particular branch. The\n"
3479
"source branch defaults to that containing the working directory, but can\n"
3480
"be changed using --from."
3483
#: bzrlib/builtins.py:5768
3485
"Both the submit branch and the public branch follow the usual behavior with\n"
3486
"respect to --remember: If there is no default location set, the first send\n"
3487
"will set it (use --no-remember to avoid setting it). After that, you can\n"
3488
"omit the location to use the default. To change the default, use\n"
3489
"--remember. The value will only be saved if the location can be accessed."
3492
#: bzrlib/builtins.py:5774
3494
"In order to calculate those changes, bzr must analyse the submit branch.\n"
3495
"Therefore it is most efficient for the submit branch to be a local mirror.\n"
3496
"If a public location is known for the submit_branch, that location is used\n"
3497
"in the merge directive."
3500
#: bzrlib/builtins.py:5779
3502
"The default behaviour is to send the merge directive by mail, unless -o is\n"
3503
"given, in which case it is sent to a file."
3506
#: bzrlib/builtins.py:5782
3508
"Mail is sent using your preferred mail program. This should be transparent\n"
3509
"on Windows (it uses MAPI). On Unix, it requires the xdg-email utility.\n"
3510
"If the preferred client can't be found (or used), your editor will be used."
3513
#: bzrlib/builtins.py:5786
3515
"To use a specific mail program, set the mail_client configuration option.\n"
3516
"(For Thunderbird 1.5, this works around some bugs.) Supported values for\n"
3517
"specific clients are \"claws\", \"evolution\", \"kmail\", \"mail.app\" "
3519
"Mail.app), \"mutt\", and \"thunderbird\"; generic options are \"default\",\n"
3520
"\"editor\", \"emacsclient\", \"mapi\", and \"xdg-email\". Plugins may also "
3522
"supported clients."
3525
#: bzrlib/builtins.py:5793
3527
"If mail is being sent, a to address is required. This can be supplied\n"
3528
"either on the commandline, by setting the submit_to configuration\n"
3529
"option in the branch itself or the child_submit_to configuration option\n"
3530
"in the submit branch."
3533
#: bzrlib/builtins.py:5798
3535
"Two formats are currently supported: \"4\" uses revision bundle format 4 "
3537
"merge directive format 2. It is significantly faster and smaller than\n"
3538
"older formats. It is compatible with Bazaar 0.19 and later. It is the\n"
3539
"default. \"0.9\" uses revision bundle format 0.9 and merge directive\n"
3540
"format 1. It is compatible with Bazaar 0.12 - 0.18."
3543
#: bzrlib/builtins.py:5804
3545
"The merge directives created by bzr send may be applied using bzr merge or\n"
3546
"bzr pull by specifying a file containing a merge directive as the location."
3549
#: bzrlib/builtins.py:5807
3551
"bzr send makes extensive use of public locations to map local locations "
3553
"URLs that can be used by other people. See `bzr help configuration` to\n"
3554
"set them, and use `bzr info` to display them."
3557
#: bzrlib/builtins.py:5831
3558
msgid "Write merge directive to this file or directory; use - for stdout."
3561
#: bzrlib/builtins.py:5835
3563
"Refuse to send if there are uncommitted changes in the working tree, --no-"
3564
"strict disables the check."
3567
#: bzrlib/builtins.py:5837
3568
msgid "Mail the request to this address."
3571
#: bzrlib/builtins.py:5841
3572
msgid "Body for the email."
3575
#: bzrlib/builtins.py:5894
3576
msgid "Do not include a bundle in the merge directive."
3579
#: bzrlib/builtins.py:5895
3580
msgid "Do not include a preview patch in the merge directive."
3583
#: bzrlib/builtins.py:5898
3584
msgid "Remember submit and public branch."
3587
#: bzrlib/builtins.py:5900
3589
"Branch to generate the submission from, rather than the one containing the "
3590
"working directory."
3593
#: bzrlib/builtins.py:5910 bzrlib/cmd_version_info.py:76
3597
#: bzrlib/builtins.py:5911
3598
msgid "Use the specified output format."
3601
#: bzrlib/builtins.py:5933
3602
msgid "Create, remove or modify a tag naming a revision."
3605
#: bzrlib/builtins.py:5935
3607
"Tags give human-meaningful names to revisions. Commands that take a -r\n"
3608
"(--revision) option can be given -rtag:X, where X is any previously\n"
3612
#: bzrlib/builtins.py:5939
3614
"Tags are stored in the branch. Tags are copied from one branch to another\n"
3615
"along when you branch, push, pull or merge."
3618
#: bzrlib/builtins.py:5942
3620
"It is an error to give a tag name that already exists unless you pass\n"
3621
"--force, in which case the tag is moved to point to the new revision."
3624
#: bzrlib/builtins.py:5945
3626
"To rename a tag (change the name but keep it on the same revsion), run "
3628
"tag new-name -r tag:old-name`` and then ``bzr tag --delete oldname``."
3631
#: bzrlib/builtins.py:5948
3633
"If no tag name is specified it will be determined through the \n"
3634
"'automatic_tag_name' hook. This can e.g. be used to automatically tag\n"
3635
"upstream releases by reading configure.ac. See ``bzr help hooks`` for\n"
3639
#: bzrlib/builtins.py:5958
3640
msgid "Delete this tag rather than placing it."
3643
#: bzrlib/builtins.py:5961
3644
msgid "Branch in which to place the tag."
3647
#: bzrlib/builtins.py:5963
3648
msgid "Replace existing tags."
3651
#: bzrlib/builtins.py:5978
3652
msgid "No tag specified to delete."
3655
#: bzrlib/builtins.py:5980
3657
msgid "Deleted tag %s."
3660
#: bzrlib/builtins.py:5985
3661
msgid "Tags can only be placed on a single revision, not on a range"
3664
#: bzrlib/builtins.py:5994
3665
msgid "Please specify a tag name."
3668
#: bzrlib/builtins.py:6002
3670
msgid "Tag %s already exists for that revision."
3673
#: bzrlib/builtins.py:6006
3675
msgid "Created tag %s."
3678
#: bzrlib/builtins.py:6008
3680
msgid "Updated tag %s."
3683
#: bzrlib/builtins.py:6012
3687
#: bzrlib/builtins.py:6014
3689
"This command shows a table of tag names and the revisions they reference."
3692
#: bzrlib/builtins.py:6020
3693
msgid "Branch whose tags should be displayed."
3696
#: bzrlib/builtins.py:6022
3697
msgid "Sort tags by different criteria."
3700
#: bzrlib/builtins.py:6022
3704
#: bzrlib/builtins.py:6091
3705
msgid "Reconfigure the type of a bzr directory."
3708
#: bzrlib/builtins.py:6093
3709
msgid "A target configuration must be specified."
3712
#: bzrlib/builtins.py:6095
3714
"For checkouts, the bind-to location will be auto-detected if not specified.\n"
3715
"The order of preference is\n"
3716
"1. For a lightweight checkout, the current bound location.\n"
3717
"2. For branches that used to be checkouts, the previously-bound location.\n"
3718
"3. The push location.\n"
3719
"4. The parent location.\n"
3720
"If none of these is available, --bind-to must be specified."
3723
#: bzrlib/builtins.py:6109
3727
#: bzrlib/builtins.py:6110
3728
msgid "The relation between branch and tree."
3731
#: bzrlib/builtins.py:6112
3732
msgid "Reconfigure to be an unbound branch with no working tree."
3735
#: bzrlib/builtins.py:6113
3736
msgid "Reconfigure to be an unbound branch with a working tree."
3739
#: bzrlib/builtins.py:6114
3740
msgid "Reconfigure to be a bound branch with a working tree."
3743
#: bzrlib/builtins.py:6115
3744
msgid "Reconfigure to be a lightweight checkout (with no local history)."
3747
#: bzrlib/builtins.py:6120
3748
msgid "Repository type"
3751
#: bzrlib/builtins.py:6121
3752
msgid "Location fo the repository."
3755
#: bzrlib/builtins.py:6123
3757
"Reconfigure to be a standalone branch (i.e. stop using shared repository)."
3760
#: bzrlib/builtins.py:6125
3761
msgid "Reconfigure to use a shared repository."
3764
#: bzrlib/builtins.py:6129
3765
msgid "Trees in Repository"
3768
#: bzrlib/builtins.py:6130
3769
msgid "Whether new branches in the repository have trees."
3772
#: bzrlib/builtins.py:6132
3774
"Reconfigure repository to create working trees on branches by default."
3777
#: bzrlib/builtins.py:6134
3779
"Reconfigure repository to not create working trees on branches by default."
3782
#: bzrlib/builtins.py:6137
3783
msgid "Branch to bind checkout to."
3786
#: bzrlib/builtins.py:6139
3787
msgid "Perform reconfiguration even if local changes will be lost."
3790
#: bzrlib/builtins.py:6142
3791
msgid "Reconfigure a branch to be stacked on another branch."
3794
#: bzrlib/builtins.py:6146
3796
"Reconfigure a branch to be unstacked. This may require copying substantial "
3800
#: bzrlib/builtins.py:6156
3801
msgid "Can't use both --stacked-on and --unstacked"
3804
#: bzrlib/builtins.py:6170
3805
msgid "No target configuration specified"
3808
#: bzrlib/builtins.py:6205
3809
msgid "Set the branch of a checkout and update."
3812
#: bzrlib/builtins.py:6207
3814
"For lightweight checkouts, this changes the branch being referenced.\n"
3815
"For heavyweight checkouts, this checks that there are no local commits\n"
3816
"versus the current bound branch, then it makes the local branch a mirror\n"
3817
"of the new location and binds to it."
3820
#: bzrlib/builtins.py:6212
3822
"In both cases, the working tree is updated and uncommitted changes\n"
3823
"are merged. The user can commit or revert these as they desire."
3826
#: bzrlib/builtins.py:6215
3827
msgid "Pending merges need to be committed or reverted before using switch."
3830
#: bzrlib/builtins.py:6217
3832
"The path to the branch to switch to can be specified relative to the parent\n"
3833
"directory of the current branch. For example, if you are currently in a\n"
3834
"checkout of /path/to/branch, specifying 'newbranch' will find a branch at\n"
3835
"/path/to/newbranch."
3838
#: bzrlib/builtins.py:6222
3840
"Bound branches use the nickname of its master branch unless it is set\n"
3841
"locally, in which case switching will update the local nickname to be\n"
3842
"that of the master."
3845
#: bzrlib/builtins.py:6230
3846
msgid "Switch even if local commits will be lost."
3849
#: bzrlib/builtins.py:6233
3850
msgid "Create the target branch from this one before switching to it."
3853
#: bzrlib/builtins.py:6236
3854
msgid "Store and restore uncommitted changes in the branch."
3857
#: bzrlib/builtins.py:6250
3858
msgid "You must supply either a revision or a location"
3861
#: bzrlib/builtins.py:6263
3862
msgid "cannot create branch without source branch"
3865
#: bzrlib/builtins.py:6289
3866
msgid "Manage filtered views."
3869
#: bzrlib/builtins.py:6291
3871
"Views provide a mask over the tree so that users can focus on\n"
3872
"a subset of a tree when doing their work. After creating a view,\n"
3873
"commands that support a list of files - status, diff, commit, etc -\n"
3874
"effectively have that list of files implicitly given each time.\n"
3875
"An explicit list of files can still be given but those files\n"
3876
"must be within the current view."
3879
#: bzrlib/builtins.py:6298
3881
"In most cases, a view has a short life-span: it is created to make\n"
3882
"a selected change and is deleted once that change is committed.\n"
3883
"At other times, you may wish to create one or more named views\n"
3884
"and switch between them."
3887
#: bzrlib/builtins.py:6303
3889
"To disable the current view without deleting it, you can switch to\n"
3890
"the pseudo view called ``off``. This can be useful when you need\n"
3891
"to see the whole tree for an operation or two (e.g. merge) but\n"
3892
"want to switch back to your view after that."
3895
#: bzrlib/builtins.py:6308
3898
" To define the current view::"
3901
#: bzrlib/builtins.py:6311
3902
msgid " bzr view file1 dir1 ..."
3905
#: bzrlib/builtins.py:6313
3906
msgid " To list the current view::"
3909
#: bzrlib/builtins.py:6315
3913
#: bzrlib/builtins.py:6317
3914
msgid " To delete the current view::"
3917
#: bzrlib/builtins.py:6319
3918
msgid " bzr view --delete"
3921
#: bzrlib/builtins.py:6321
3922
msgid " To disable the current view without deleting it::"
3925
#: bzrlib/builtins.py:6323
3926
msgid " bzr view --switch off"
3929
#: bzrlib/builtins.py:6325
3930
msgid " To define a named view and switch to it::"
3933
#: bzrlib/builtins.py:6327
3934
msgid " bzr view --name view-name file1 dir1 ..."
3937
#: bzrlib/builtins.py:6329
3938
msgid " To list a named view::"
3941
#: bzrlib/builtins.py:6331
3942
msgid " bzr view --name view-name"
3945
#: bzrlib/builtins.py:6333
3946
msgid " To delete a named view::"
3949
#: bzrlib/builtins.py:6335
3950
msgid " bzr view --name view-name --delete"
3953
#: bzrlib/builtins.py:6337
3954
msgid " To switch to a named view::"
3957
#: bzrlib/builtins.py:6339
3958
msgid " bzr view --switch view-name"
3961
#: bzrlib/builtins.py:6341
3962
msgid " To list all views defined::"
3965
#: bzrlib/builtins.py:6343
3966
msgid " bzr view --all"
3969
#: bzrlib/builtins.py:6345
3970
msgid " To delete all views::"
3973
#: bzrlib/builtins.py:6347
3974
msgid " bzr view --delete --all"
3977
#: bzrlib/builtins.py:6354
3978
msgid "Apply list or delete action to all views."
3981
#: bzrlib/builtins.py:6357
3982
msgid "Delete the view."
3985
#: bzrlib/builtins.py:6360
3986
msgid "Name of the view to define, list or delete."
3989
#: bzrlib/builtins.py:6364
3990
msgid "Name of the view to switch to."
3993
#: bzrlib/builtins.py:6383
3994
msgid "Both --delete and a file list specified"
3997
#: bzrlib/builtins.py:6386
3998
msgid "Both --delete and --switch specified"
4001
#: bzrlib/builtins.py:6389
4002
msgid "Deleted all views.\n"
4005
#: bzrlib/builtins.py:6391
4006
msgid "No current view to delete"
4009
#: bzrlib/builtins.py:6394
4011
msgid "Deleted '%s' view.\n"
4014
#: bzrlib/builtins.py:6398
4015
msgid "Both --switch and a file list specified"
4018
#: bzrlib/builtins.py:6401
4019
msgid "Both --switch and --all specified"
4022
#: bzrlib/builtins.py:6404
4023
msgid "No current view to disable"
4026
#: bzrlib/builtins.py:6406
4028
msgid "Disabled '%s' view.\n"
4031
#: bzrlib/builtins.py:6410 bzrlib/builtins.py:6432
4032
msgid "Using '{0}' view: {1}\n"
4035
#: bzrlib/builtins.py:6413
4036
msgid "Views defined:\n"
4039
#: bzrlib/builtins.py:6422
4040
msgid "No views defined.\n"
4043
#: bzrlib/builtins.py:6429
4044
msgid "Cannot change the 'off' pseudo view"
4047
#: bzrlib/builtins.py:6437
4048
msgid "No current view.\n"
4051
#: bzrlib/builtins.py:6440
4052
msgid "'{0}' view is: {1}\n"
4055
#: bzrlib/builtins.py:6460
4056
msgid " <no hooks installed>\n"
4059
#: bzrlib/builtins.py:6464
4060
msgid "Remove a branch."
4063
#: bzrlib/builtins.py:6466
4065
"This will remove the branch from the specified location but \n"
4066
"will keep any working tree or repository in place."
4069
#: bzrlib/builtins.py:6471
4070
msgid " Remove the branch at repo/trunk::"
4073
#: bzrlib/builtins.py:6473
4074
msgid " bzr remove-branch repo/trunk"
4077
#: bzrlib/builtins.py:6480
4078
msgid "Remove branch even if it is the active branch."
4081
#: bzrlib/builtins.py:6494
4082
msgid "Branch is active. Use --force to remove it."
4085
#: bzrlib/builtins.py:6498
4086
msgid "Plaintext diff output."
4089
#: bzrlib/builtins.py:6499
4090
msgid "Temporarily set aside some changes from the current tree."
4093
#: bzrlib/builtins.py:6501
4095
"Shelve allows you to temporarily put changes you've made \"on the shelf\",\n"
4096
"ie. out of the way, until a later time when you can bring them back from\n"
4097
"the shelf with the 'unshelve' command. The changes are stored alongside\n"
4098
"your working tree, and so they aren't propagated along with your branch nor\n"
4099
"will they survive its deletion."
4102
#: bzrlib/builtins.py:6507
4103
msgid "If shelve --list is specified, previously-shelved changes are listed."
4106
#: bzrlib/builtins.py:6509
4108
"Shelve is intended to help separate several sets of changes that have\n"
4109
"been inappropriately mingled. If you just want to get rid of all changes\n"
4110
"and you don't need to restore them later, use revert. If you want to\n"
4111
"shelve all text changes at once, use shelve --all."
4114
#: bzrlib/builtins.py:6514
4116
"If filenames are specified, only the changes to those files will be\n"
4117
"shelved. Other files will be left untouched."
4120
#: bzrlib/builtins.py:6517
4122
"If a revision is specified, changes since that revision will be shelved."
4125
#: bzrlib/builtins.py:6519
4127
"You can put multiple items on the shelf, and by default, 'unshelve' will\n"
4128
"restore the most recently shelved changes."
4131
#: bzrlib/builtins.py:6522
4133
"For complicated changes, it is possible to edit the changes in a separate\n"
4134
"editor program to decide what the file remaining in the working copy\n"
4135
"should look like. To do this, add the configuration option"
4138
#: bzrlib/builtins.py:6526
4139
msgid " change_editor = PROGRAM @new_path @old_path"
4142
#: bzrlib/builtins.py:6528
4144
"where @new_path is replaced with the path of the new version of the \n"
4145
"file and @old_path is replaced with the path of the old version of \n"
4146
"the file. The PROGRAM should save the new file with the desired \n"
4147
"contents of the file in the working tree.\n"
4151
#: bzrlib/builtins.py:6540
4152
msgid "Shelve all changes."
4155
#: bzrlib/builtins.py:6542
4156
msgid "Method to use for writing diffs."
4159
#: bzrlib/builtins.py:6542
4163
#: bzrlib/builtins.py:6546
4164
msgid "List shelved changes."
4167
#: bzrlib/builtins.py:6548
4168
msgid "Destroy removed changes instead of shelving them."
4171
#: bzrlib/builtins.py:6577
4172
msgid "No shelved changes."
4175
#: bzrlib/builtins.py:6588
4176
msgid "Restore shelved changes."
4179
#: bzrlib/builtins.py:6590
4181
"By default, the most recently shelved changes are restored. However if you\n"
4182
"specify a shelf by id those changes will be restored instead. This works\n"
4183
"best when the changes don't depend on each other."
4186
#: bzrlib/builtins.py:6599
4187
msgid "The action to perform."
4190
#: bzrlib/builtins.py:6599 bzrlib/conflicts.py:694
4194
#: bzrlib/builtins.py:6601
4195
msgid "Apply changes and remove from the shelf."
4198
#: bzrlib/builtins.py:6602
4199
msgid "Show changes, but do not apply or remove them."
4202
#: bzrlib/builtins.py:6603
4204
"Instead of unshelving the changes, show the diff that would result from "
4208
#: bzrlib/builtins.py:6605
4209
msgid "Delete changes without applying them."
4212
#: bzrlib/builtins.py:6606
4213
msgid "Apply changes but don't delete them."
4216
#: bzrlib/builtins.py:6621
4217
msgid "Remove unwanted files from working tree."
4220
#: bzrlib/builtins.py:6623
4222
"By default, only unknown files, not ignored files, are deleted. Versioned\n"
4223
"files are never deleted."
4226
#: bzrlib/builtins.py:6626
4228
"Another class is 'detritus', which includes files emitted by bzr during\n"
4229
"normal operations and selftests. (The value of these files decreases with\n"
4233
#: bzrlib/builtins.py:6630
4235
"If no options are specified, unknown files are deleted. Otherwise, option\n"
4236
"flags are respected, and may be combined."
4239
#: bzrlib/builtins.py:6633
4240
msgid "To check what clean-tree will do, use --dry-run."
4243
#: bzrlib/builtins.py:6636
4244
msgid "Delete all ignored files."
4247
#: bzrlib/builtins.py:6637
4249
"Delete conflict files, merge and revert backups, and failed selftest dirs."
4252
#: bzrlib/builtins.py:6640
4253
msgid "Delete files unknown to bzr (default)."
4256
#: bzrlib/builtins.py:6641
4257
msgid "Show files to delete instead of deleting them."
4260
#: bzrlib/builtins.py:6643
4261
msgid "Do not prompt before deleting."
4264
#: bzrlib/bundle/__init__.py:59
4265
msgid "A directory cannot be a bundle"
4268
#: bzrlib/bundle/apply_bundle.py:40
4269
msgid "Install revisions"
4272
#: bzrlib/bundle/commands.py:64
4273
msgid "--verbose requires a merge directive"
4276
#: bzrlib/bundle/commands.py:67
4277
msgid "Bundle format not supported"
4280
#: bzrlib/bundle/commands.py:77
4284
#: bzrlib/bundle/commands.py:81
4285
msgid "{0}: {1} ({2} multiparent)\n"
4288
#: bzrlib/bundle/commands.py:83
4290
msgid "unique files: %d\n"
4293
#: bzrlib/bundle/commands.py:92
4297
#: bzrlib/bundle/commands.py:93
4302
#: bzrlib/bundle/commands.py:95
4309
#: bzrlib/bundle/commands.py:103
4310
msgid "Decoded contents\n"
4313
#: bzrlib/bundle/serializer/v4.py:327
4315
msgid "Bundling %d revision."
4316
msgid_plural "Bundling %d revisions."
4320
#: bzrlib/bzrdir.py:487
4322
"making backup of {0}\n"
4326
#: bzrlib/bzrdir.py:510
4327
msgid "renamed {0} to {1}"
4330
#: bzrlib/bzrdir.py:1639
4333
"Source repository format does not support stacking, using format:\n"
4337
#: bzrlib/bzrdir.py:1659
4340
"Source branch format does not support stacking, using format:\n"
4344
#: bzrlib/bzrdir.py:1805
4345
msgid "starting repository conversion"
4348
#: bzrlib/bzrdir.py:2026
4349
msgid "Using default stacking branch {0} at {1}"
4352
#: bzrlib/check.py:108
4356
#: bzrlib/check.py:110
4357
msgid "checking revisions"
4360
#: bzrlib/check.py:112
4361
msgid "checking commit contents"
4364
#: bzrlib/check.py:114
4365
msgid "checking file graphs"
4368
#: bzrlib/check.py:118
4369
msgid "checking branches and trees"
4372
#: bzrlib/check.py:205
4373
msgid "checked repository {0} format {1}"
4376
#: bzrlib/check.py:208
4378
msgid "%6d revisions"
4381
#: bzrlib/check.py:209
4383
msgid "%6d file-ids"
4386
#: bzrlib/check.py:211
4388
msgid "%6d unreferenced text versions"
4391
#: bzrlib/check.py:215
4392
msgid "unreferenced version: {{{0}}} in {1}"
4395
#: bzrlib/check.py:218
4397
msgid "%6d revisions are missing inventory_sha1"
4400
#: bzrlib/check.py:221
4402
msgid "%6d revisions are mentioned but not present"
4405
#: bzrlib/check.py:224
4407
msgid "%6d ghost revisions"
4410
#: bzrlib/check.py:229
4412
msgid "%6d revisions missing parents in ancestry"
4415
#: bzrlib/check.py:233
4417
msgid " %s should be in the ancestry for:"
4420
#: bzrlib/check.py:237
4422
msgid "%6d inconsistent parents"
4425
#: bzrlib/check.py:241
4426
msgid " * {0} version {1} has parents {2!r} but should have {3!r}"
4429
#: bzrlib/check.py:247
4431
msgid "%6d revisions have incorrect parents in the revision index"
4434
#: bzrlib/check.py:253
4435
msgid " {0} has wrong parents in index: {1!r} should be {2!r}"
4438
#: bzrlib/check.py:267
4439
msgid "Mismatched internal revid {{{0}}} and index revid {{{1}}}"
4442
#: bzrlib/check.py:296
4444
"Multiple expected sha1s for {0}. {{{1}}} expects {{{2}}}, {{{3}}} expects "
4448
#: bzrlib/check.py:354
4450
msgid "Checking branch at '%s'."
4453
#: bzrlib/check.py:374
4455
msgid "Checking working tree at '%s'."
4458
#: bzrlib/check.py:427 bzrlib/check.py:441
4459
msgid "No branch found at specified location."
4462
#: bzrlib/check.py:429 bzrlib/check.py:439
4463
msgid "No working tree found at specified location."
4466
#: bzrlib/check.py:432
4468
msgid "Checking repository at '%s'."
4471
#: bzrlib/check.py:443
4472
msgid "No repository found at specified location."
4475
#: bzrlib/clean_tree.py:63
4476
msgid "Nothing to delete."
4479
#: bzrlib/clean_tree.py:68
4480
msgid "Are you sure you wish to delete these"
4483
#: bzrlib/clean_tree.py:70
4487
#: bzrlib/clean_tree.py:107
4489
msgid "unable to remove %s"
4492
#: bzrlib/clean_tree.py:111
4493
msgid "deleting paths:"
4496
#: bzrlib/clean_tree.py:125
4497
msgid "unable to remove \"{0}\": {1}."
4500
#: bzrlib/clean_tree.py:130
4501
msgid "No files deleted."
4504
#: bzrlib/cmd_version_info.py:47
4505
msgid "No known version info format {0}. Supported types are: {1}"
4508
#: bzrlib/cmd_version_info.py:52
4509
msgid "Version info in Custom template-based format."
4512
#: bzrlib/cmd_version_info.py:52
4513
msgid "Version info in Python format."
4516
#: bzrlib/cmd_version_info.py:52
4517
msgid "Version info in RIO (simple text) format (default)."
4520
#: bzrlib/cmd_version_info.py:53
4521
msgid "Show version information about this tree."
4524
#: bzrlib/cmd_version_info.py:55
4526
"You can use this command to add information about version into\n"
4527
"source code of an application. The output can be in one of the\n"
4528
"supported formats or in a custom format based on a template."
4531
#: bzrlib/cmd_version_info.py:59 en/help_topics/configuration.txt:712
4532
#: en/help_topics/configuration.txt:738
4533
msgid "For example::"
4536
#: bzrlib/cmd_version_info.py:61
4538
" bzr version-info --custom \\\n"
4539
" --template=\"#define VERSION_INFO \\\"Project 1.2.3 (r{revno})\\\"\\n\""
4542
#: bzrlib/cmd_version_info.py:64
4544
"will produce a C header file with formatted string containing the\n"
4545
"current revision number. Other supported variables in templates are:"
4548
#: bzrlib/cmd_version_info.py:67
4550
" * {date} - date of the last revision\n"
4551
" * {build_date} - current date\n"
4552
" * {revno} - revision number\n"
4553
" * {revision_id} - revision id\n"
4554
" * {branch_nick} - branch nickname\n"
4555
" * {clean} - 0 if the source tree contains uncommitted changes,\n"
4559
#: bzrlib/cmd_version_info.py:77
4560
msgid "Select the output format."
4563
#: bzrlib/cmd_version_info.py:81
4564
msgid "Include all possible information."
4567
#: bzrlib/cmd_version_info.py:82
4568
msgid "Check if tree is clean."
4571
#: bzrlib/cmd_version_info.py:84
4572
msgid "Include the revision-history."
4575
#: bzrlib/cmd_version_info.py:86
4576
msgid "Include the last revision for each file."
4579
#: bzrlib/cmd_version_info.py:87
4580
msgid "Template for the output."
4583
#: bzrlib/cmd_version_info.py:101
4584
msgid "bzr version-info --revision takes exactly one revision specifier"
4587
#: bzrlib/commands.py:229
4589
msgid "unknown command \"%s\""
4592
#: bzrlib/commands.py:476
4593
msgid "No help for this command."
4596
#: bzrlib/commands.py:489
4598
msgid ":Purpose: %s\n"
4601
#: bzrlib/commands.py:491
4608
#: bzrlib/commands.py:493
4610
msgid ":Usage: %s\n"
4613
#: bzrlib/commands.py:512
4618
#: bzrlib/commands.py:523
4626
#: bzrlib/commands.py:533
4629
"See bzr help %s for more details and examples.\n"
4633
#: bzrlib/commands.py:538
4637
#: bzrlib/commands.py:542
4639
msgid ":From: plugin \"%s\"\n"
4642
#: bzrlib/commands.py:554
4643
msgid ":doc:`{0} <{1}-help>`"
4646
#: bzrlib/commands.py:558
4648
msgid ":See also: %s"
4651
#: bzrlib/commands.py:826 bzrlib/gpg.py:347
4652
msgid "Only ASCII permitted in option names"
4655
#: bzrlib/commands.py:851 bzrlib/commands.py:859
4656
msgid "command {0!r} needs one or more {1}"
4659
#: bzrlib/commands.py:868
4660
msgid "command {0!r} requires argument {1}"
4663
#: bzrlib/commands.py:875
4664
msgid "extra argument to command {0}: {1}"
4667
#: bzrlib/commands.py:952
4669
msgid "Profile data written to \"%s\"."
4672
#: bzrlib/commit.py:117 bzrlib/commit.py:740
4676
#: bzrlib/commit.py:117 bzrlib/commit.py:748
4680
#: bzrlib/commit.py:131
4682
msgid "Committing%s"
4685
#: bzrlib/commit.py:134
4687
msgid "Committed revision %d."
4690
#: bzrlib/commit.py:143
4695
#: bzrlib/commit.py:146
4700
#: bzrlib/commit.py:511
4702
"Conflicting tags in bound branch:\n"
4706
#: bzrlib/commit.py:742
4710
#: bzrlib/commit.py:976
4714
#: bzrlib/commit.py:998
4715
msgid "{0} [{1}] - Stage"
4718
#: bzrlib/commit.py:1001
4723
#: bzrlib/commit_signature_commands.py:34
4724
msgid "Sign all commits by a given committer."
4727
#: bzrlib/commit_signature_commands.py:36
4729
"If location is not specified the local tree is used.\n"
4730
"If committer is not specified the default committer is used."
4733
#: bzrlib/commit_signature_commands.py:39
4734
msgid "This does not sign commits that already have signatures."
4737
#: bzrlib/commit_signature_commands.py:47
4739
"Don't actually sign anything, just print the revisions that would be signed."
4742
#: bzrlib/commit_signature_commands.py:98
4744
msgid "Signed %d revision.\n"
4745
msgid_plural "Signed %d revisions.\n"
4749
#: bzrlib/commit_signature_commands.py:103
4750
msgid "Verify all commit signatures."
4753
#: bzrlib/commit_signature_commands.py:105
4755
"Verifies that all commits in the branch are signed by known GnuPG keys."
4758
#: bzrlib/commit_signature_commands.py:110
4760
"Comma separated list of GPG key patterns which are acceptable for "
4764
#: bzrlib/commit_signature_commands.py:148
4765
msgid "Cannot verify a range of non-revision-history revisions"
4768
#: bzrlib/commit_signature_commands.py:166
4769
msgid "All commits signed with verifiable keys"
4772
#: bzrlib/config.py:438
4773
msgid "Invalid config value for \"{0}\" value {1!r} is not an SI unit."
4776
#: bzrlib/config.py:2468
4777
msgid "{0} is not an SI unit."
4780
#: bzrlib/config.py:2989
4782
"Option {0} in section {1} of {2} was changed from {3} to {4}. The {5} value "
4786
#: bzrlib/config.py:3134
4788
msgid "Invalid '%s', should be of the form 'name=value'"
4791
#: bzrlib/config.py:4089
4792
msgid "Display, set or remove a configuration option."
4795
#: bzrlib/config.py:4091
4796
msgid "Display the active value for option NAME."
4799
#: bzrlib/config.py:4093
4801
"If --all is specified, NAME is interpreted as a regular expression and all\n"
4802
"matching options are displayed mentioning their scope and without resolving\n"
4803
"option references in the value). The active value that bzr will take into\n"
4804
"account is the first one displayed for each option."
4807
#: bzrlib/config.py:4098
4809
"If NAME is not given, --all .* is implied (all options are displayed for "
4814
#: bzrlib/config.py:4101
4816
"Setting a value is achieved by using NAME=value without spaces. The value\n"
4817
"is set in the most relevant scope and can be checked by displaying the\n"
4821
#: bzrlib/config.py:4105
4822
msgid "Removing a value is achieved by using --remove NAME."
4825
#: bzrlib/config.py:4115
4826
msgid "Reduce the scope to the specified configuration file."
4829
#: bzrlib/config.py:4119
4830
msgid "Display all the defined values for the matching options."
4833
#: bzrlib/config.py:4121
4834
msgid "Remove the option from the configuration file."
4837
#: bzrlib/conflicts.py:50
4838
msgid "List files with conflicts."
4841
#: bzrlib/conflicts.py:57
4843
"Conflicts normally are listed as short, human-readable messages. If --text\n"
4844
"is supplied, the pathnames of files with text conflicts are listed,\n"
4845
"instead. (This is useful for editing all files with text conflicts.)"
4848
#: bzrlib/conflicts.py:61
4849
msgid "Use bzr resolve when you have fixed a problem."
4852
#: bzrlib/conflicts.py:66
4853
msgid "List paths of files with text conflicts."
4856
#: bzrlib/conflicts.py:85
4857
msgid "Marks the conflict as resolved."
4860
#: bzrlib/conflicts.py:88
4861
msgid "Resolve the conflict preserving the version in the working tree."
4864
#: bzrlib/conflicts.py:91
4865
msgid "Resolve the conflict taking the merged version into account."
4868
#: bzrlib/conflicts.py:98
4869
msgid "How to resolve the conflict."
4872
#: bzrlib/conflicts.py:104
4873
msgid "Mark a conflict as resolved."
4876
#: bzrlib/conflicts.py:111
4878
"Once you have fixed a problem, use \"bzr resolve\" to automatically mark\n"
4879
"text conflicts as fixed, \"bzr resolve FILE\" to mark a specific conflict "
4881
"resolved, or \"bzr resolve --all\" to mark all conflicts as resolved."
4884
#: bzrlib/conflicts.py:119
4885
msgid "Resolve all conflicts in this tree."
4888
#: bzrlib/conflicts.py:126
4889
msgid "If --all is specified, no FILE may be provided"
4892
#: bzrlib/conflicts.py:151
4894
msgid "%d conflict auto-resolved."
4895
msgid_plural "%d conflicts auto-resolved."
4899
#: bzrlib/conflicts.py:154
4900
msgid "Remaining conflicts:"
4903
#: bzrlib/conflicts.py:159
4904
msgid "All conflicts resolved."
4907
#: bzrlib/conflicts.py:168
4908
msgid "{0} conflict resolved, {1} remaining"
4909
msgid_plural "{0} conflicts resolved, {1} remaining"
4913
#: bzrlib/controldir.py:712
4914
msgid "{0} is{1} redirected to {2}"
4917
#: bzrlib/diff.py:400
4919
msgid "*** Ignoring files outside view. View is %s"
4922
#: bzrlib/errors.py:157
4923
msgid "The tree builder is already building a tree."
4926
#: bzrlib/errors.py:178
4927
msgid "The dirstate file (%(state)s) appears to be corrupt: %(msg)s"
4930
#: bzrlib/errors.py:197
4932
"The API for \"%(api)s\" is not compatible with \"%(wanted)s\". It supports "
4933
"versions \"%(minimum)s\" to \"%(current)s\"."
4936
#: bzrlib/errors.py:209
4937
msgid "The transport '%(transport)s' is only accessible within this process."
4940
#: bzrlib/errors.py:227
4941
msgid "Invalid revision number %(revno)s"
4944
#: bzrlib/errors.py:236
4945
msgid "Invalid revision-id {%(revision_id)s} in %(branch)s"
4948
#: bzrlib/errors.py:247
4949
msgid "Reserved revision-id {%(revision_id)s}"
4952
#: bzrlib/errors.py:261
4953
msgid "There is no public branch set for \"%(branch_url)s\"."
4956
#: bzrlib/errors.py:271
4958
"No help could be found for '%(topic)s'. Please use 'bzr help topics' to "
4959
"obtain a list of topics."
4962
#: bzrlib/errors.py:280
4963
msgid "The file id \"%(file_id)s\" is not present in the tree %(tree)s."
4966
#: bzrlib/errors.py:290
4968
"The file id \"%(file_id)s\" is not present in the repository %(repository)r"
4971
#: bzrlib/errors.py:299
4972
msgid "The branch '%(branch)s' is not stacked."
4975
#: bzrlib/errors.py:313
4976
msgid "No WorkingTree exists for \"%(base)s\"."
4979
#: bzrlib/errors.py:322
4980
msgid "Not currently building a tree."
4983
#: bzrlib/errors.py:327
4984
msgid "%(url)s is not a local path."
4987
#: bzrlib/errors.py:355
4988
msgid "%(not_locked)r is not write locked but needs to be."
4991
#: bzrlib/errors.py:363
4992
msgid "Error in command line options"
4995
#: bzrlib/errors.py:368
4996
msgid "%(value)s is not an index of type %(_type)s."
4999
#: bzrlib/errors.py:378
5000
msgid "Error in data for index %(value)s."
5003
#: bzrlib/errors.py:387
5004
msgid "The key '%(key)s' is already in index '%(index)s'."
5007
#: bzrlib/errors.py:397
5008
msgid "The key '%(key)s' is not a valid key."
5011
#: bzrlib/errors.py:406
5012
msgid "Could not parse options for index %(value)s."
5015
#: bzrlib/errors.py:415
5016
msgid "The value '%(value)s' is not a valid value."
5019
#: bzrlib/errors.py:424
5020
msgid "Bad value \"%(value)s\" for option \"%(name)s\"."
5023
#: bzrlib/errors.py:443
5024
msgid "Generic path error: %(path)r%(extra)s)"
5027
#: bzrlib/errors.py:456
5028
msgid "No such file: %(path)r%(extra)s"
5031
#: bzrlib/errors.py:461
5032
msgid "File exists: %(path)r%(extra)s"
5035
#: bzrlib/errors.py:467
5037
"Could not rename %(source)s => %(dest)s because both files exist. (Use --"
5038
"after to tell bzr about a rename that has already happened)%(extra)s"
5041
#: bzrlib/errors.py:483
5042
msgid "\"%(path)s\" is not a directory %(extra)s"
5045
#: bzrlib/errors.py:488
5046
msgid "\"%(path)s\" is not in the working directory %(extra)s"
5049
#: bzrlib/errors.py:493
5050
msgid "Directory not empty: \"%(path)s\"%(extra)s"
5053
#: bzrlib/errors.py:498
5054
msgid "Hard-linking \"%(path)s\" is not supported"
5057
#: bzrlib/errors.py:513
5058
msgid "Device or resource busy: \"%(path)s\"%(extra)s"
5061
#: bzrlib/errors.py:518
5062
msgid "Permission denied: \"%(path)s\"%(extra)s"
5065
#: bzrlib/errors.py:523
5066
msgid "Invalid url supplied to transport: \"%(path)s\"%(extra)s"
5069
#: bzrlib/errors.py:528
5070
msgid "Invalid URL join request: %(reason)s: %(base)r + %(join_args)r"
5073
#: bzrlib/errors.py:539
5074
msgid "URLs differ by more than path: %(from_)r and %(to)r"
5077
#: bzrlib/errors.py:561
5078
msgid "The %(type)s hook '%(hook)s' is unknown in this version of bzrlib."
5081
#: bzrlib/errors.py:571
5082
msgid "Unsupported protocol for url \"%(path)s\"%(extra)s"
5085
#: bzrlib/errors.py:579
5087
"The branch '%(url)s'(%(format)s) is not a stackable format. You will need to "
5088
"upgrade the branch to permit branch stacking."
5091
#: bzrlib/errors.py:590
5092
msgid "The branch '%(branch_url)s' cannot be stacked on '%(target_url)s'."
5095
#: bzrlib/errors.py:600
5097
"The repository '%(url)s'(%(format)s) is not a stackable format. You will "
5098
"need to upgrade the repository to permit branch stacking."
5101
#: bzrlib/errors.py:611
5102
msgid "Error reading from %(path)r."
5105
#: bzrlib/errors.py:630
5106
msgid "Path \"%(path)s\" is not a child of path \"%(base)s\"%(extra)s"
5109
#: bzrlib/errors.py:646
5110
msgid "Path \"%(path)s\" is not unicode normalized"
5113
#: bzrlib/errors.py:654
5114
msgid "Not a branch: \"%(path)s\"%(detail)s."
5117
#: bzrlib/errors.py:696
5118
msgid "No submit branch available for branch \"%(path)s\""
5121
#: bzrlib/errors.py:705
5122
msgid "A control directory already exists: \"%(path)s\"."
5125
#: bzrlib/errors.py:710
5126
msgid "Already a branch: \"%(path)s\"."
5129
#: bzrlib/errors.py:715
5130
msgid "Invalid branch name: %(name)s"
5133
#: bzrlib/errors.py:724
5134
msgid "Parent branch already exists: \"%(path)s\"."
5137
#: bzrlib/errors.py:730
5139
"Directory contains a branch, but no working tree (use bzr checkout if you "
5140
"wish to build a working tree): \"%(path)s\""
5143
#: bzrlib/errors.py:735
5145
"\"%(function)s\" called on an AtomicFile after it was closed: \"%(path)s\""
5148
#: bzrlib/errors.py:745
5150
"Parent not accessible given base \"%(base)s\" and relative path \"%(path)s\""
5153
#: bzrlib/errors.py:755
5154
msgid "No repository present: \"%(path)s\""
5157
#: bzrlib/errors.py:762
5159
"Unsupported branch format: %(format)s\n"
5160
"Please run 'bzr upgrade'"
5163
#: bzrlib/errors.py:768
5164
msgid "Unknown %(kind)s format: %(format)r"
5167
#: bzrlib/errors.py:777
5168
msgid "Format %(format)s is not compatible with .bzr version %(bzrdir)s."
5171
#: bzrlib/errors.py:787
5172
msgid "Parse error on line %(lineno)d of %(format)s format: %(line)s"
5175
#: bzrlib/errors.py:802
5178
"is not compatible with\n"
5183
#: bzrlib/errors.py:818
5184
msgid "Revision is not compatible with %(repo_format)s"
5187
#: bzrlib/errors.py:828
5188
msgid "%(context_info)s%(path)s is already versioned."
5191
#: bzrlib/errors.py:849
5192
msgid "%(context_info)s%(path)s is not versioned."
5195
#: bzrlib/errors.py:870
5196
msgid "Path(s) are not versioned: %(paths_as_string)s"
5199
#: bzrlib/errors.py:881
5200
msgid "Path(s) do not exist: %(paths_as_string)s%(extra)s"
5203
#: bzrlib/errors.py:900
5204
msgid "Cannot operate on \"%(filename)s\" of unsupported kind \"%(kind)s\""
5207
#: bzrlib/errors.py:908
5209
"Filename %(filename)r is not valid in your current filesystem encoding "
5213
#: bzrlib/errors.py:919
5214
msgid "Cannot operate on \"%(filename)s\" because it is a control file"
5217
#: bzrlib/errors.py:937
5218
msgid "The lock for '%(lock_description)s' is in use and cannot be broken."
5221
#: bzrlib/errors.py:976
5222
msgid "Cannot lock %(lock)s: %(why)s"
5225
#: bzrlib/errors.py:986
5227
"A transaction related operation was attempted after the transaction finished."
5230
#: bzrlib/errors.py:1013
5231
msgid "Cannot lock: transport is read only: %(transport)s"
5234
#: bzrlib/errors.py:1021
5235
msgid "Could not acquire lock \"%(lock)s\": %(msg)s"
5238
#: bzrlib/errors.py:1032
5240
"Lock was broken while still open: %(lock)s - check storage consistency!"
5243
#: bzrlib/errors.py:1043
5245
"Lock was released and re-acquired before being broken: %(lock)s: held by "
5246
"%(holder)r, wanted to break %(target)r"
5249
#: bzrlib/errors.py:1055
5251
"Lock is apparently held, but corrupted: %(corruption_info)s\n"
5252
"Use 'bzr break-lock' to clear it"
5255
#: bzrlib/errors.py:1068
5256
msgid "Lock not held: %(lock)s"
5259
#: bzrlib/errors.py:1097
5260
msgid "No changes to commit"
5263
#: bzrlib/errors.py:1102
5265
"Selected-file commit of merges is not supported yet: files %(files_str)s"
5268
#: bzrlib/errors.py:1112
5270
"Excluding paths during commit is not supported by repository at "
5274
#: bzrlib/errors.py:1121
5276
"The specified commit message contains characters unsupported by the current "
5280
#: bzrlib/errors.py:1127
5281
msgid "Upgrade URL cannot work with readonly URLs."
5284
#: bzrlib/errors.py:1132
5285
msgid "The branch format %(format)s is already at the most recent format."
5288
#: bzrlib/errors.py:1155
5289
msgid "Option --change does not accept revision ranges"
5292
#: bzrlib/errors.py:1160
5293
msgid "No namespace registered for string: %(spec)r"
5296
#: bzrlib/errors.py:1179
5298
"Requested revision: '%(spec)s' does not exist in branch: "
5299
"%(branch_url)s%(extra)s"
5302
#: bzrlib/errors.py:1193
5304
"Operation denied because it would change the main history, which is not "
5305
"permitted by the append_revisions_only setting on branch \"%(location)s\"."
5308
#: bzrlib/errors.py:1204
5310
"These branches have diverged. Use the missing command to see how.\n"
5311
"Use the merge command to reconcile them."
5314
#: bzrlib/errors.py:1224
5316
"Branches have no common ancestor, and no merge base revision was specified."
5319
#: bzrlib/errors.py:1230
5321
"Selected merge cannot perform reverse cherrypicks. Try merge3 or diff3."
5324
#: bzrlib/errors.py:1236
5325
msgid "Revisions have no common ancestor: %(revision_a)s %(revision_b)s"
5328
#: bzrlib/errors.py:1245
5330
"Revisions are not derived from the same root: %(revision_a)s %(revision_b)s."
5333
#: bzrlib/errors.py:1254
5334
msgid "Revision %(rev_id)s is not an ancestor of %(not_ancestor_id)s"
5337
#: bzrlib/errors.py:1263
5338
msgid "Branch %(branch)s has no commits."
5341
#: bzrlib/errors.py:1281
5343
"Bound branch %(branch)s is out of date with master branch "
5344
"%(master)s.%(extra_help)s"
5347
#: bzrlib/errors.py:1293
5349
"Cannot commit to branch %(branch)s. It is bound to %(master)s, which is "
5350
"bound to %(remote)s."
5353
#: bzrlib/errors.py:1305
5354
msgid "Cannot pull --overwrite to a branch which is bound %(branch)s"
5357
#: bzrlib/errors.py:1314
5359
"Unable to connect to target of bound branch %(branch)s => %(target)s: "
5363
#: bzrlib/errors.py:1326
5364
msgid "Error in processing weave: %(msg)s"
5367
#: bzrlib/errors.py:1335
5368
msgid "Revision {%(revision_id)s} already present in %(weave)s"
5371
#: bzrlib/errors.py:1346
5372
msgid "Revision {%(revision_id)s} not present in %(weave)s"
5375
#: bzrlib/errors.py:1356
5376
msgid "Weave invariant violated: %(what)s"
5379
#: bzrlib/errors.py:1365
5380
msgid "Parents are mismatched between two revisions. %(msg)s"
5383
#: bzrlib/errors.py:1387
5385
"Weaves differ on text content. Revision: {%(revision_id)s}, %(weave_a)s, "
5389
#: bzrlib/errors.py:1399
5390
msgid "Versioned file error"
5393
#: bzrlib/errors.py:1404
5394
msgid "Revision {%(revision_id)s} not present in \"%(file_id)s\"."
5397
#: bzrlib/errors.py:1414
5398
msgid "Revision {%(revision_id)s} already present in \"%(file_id)s\"."
5401
#: bzrlib/errors.py:1424
5402
msgid "Text did not match its checksum: %(msg)s"
5405
#: bzrlib/errors.py:1550
5406
msgid "Export format %(format)r not supported"
5409
#: bzrlib/errors.py:1559
5410
msgid "Transport error: %(msg)s %(orig_error)s"
5413
#: bzrlib/errors.py:1585
5414
msgid "Generic bzr smart protocol error: %(details)s"
5417
#: bzrlib/errors.py:1593
5418
msgid "Received bad protocol version marker: %(marker)r"
5421
#: bzrlib/errors.py:1625
5422
msgid "Transport operation not possible: %(msg)s %(orig_error)s"
5425
#: bzrlib/errors.py:1630
5426
msgid "Connection error: %(msg)s %(orig_error)s"
5429
#: bzrlib/errors.py:1635
5430
msgid "%(msg)s %(host)s%(port)s%(orig_error)s"
5433
#: bzrlib/errors.py:1656
5434
msgid "Connection closed: %(msg)s %(orig_error)s"
5437
#: bzrlib/errors.py:1661
5438
msgid "Connection Timeout: %(msg)s%(orig_error)s"
5441
#: bzrlib/errors.py:1666
5442
msgid "Invalid range access in %(path)s at %(offset)s: %(msg)s"
5445
#: bzrlib/errors.py:1676
5446
msgid "Invalid http response for %(path)s: %(msg)s%(orig_error)s"
5449
#: bzrlib/errors.py:1691
5450
msgid "Certificate error: %(error)s"
5453
#: bzrlib/errors.py:1699
5454
msgid "Invalid http range %(range)r for %(path)s: %(msg)s"
5457
#: bzrlib/errors.py:1713
5458
msgid "HTTP MIME Boundary missing for %(path)s: %(msg)s"
5461
#: bzrlib/errors.py:1721
5462
msgid "Invalid http Content-type \"%(ctype)s\" for %(path)s: %(msg)s"
5465
#: bzrlib/errors.py:1730
5466
msgid "%(source)s is%(permanently)s redirected to %(target)s"
5469
#: bzrlib/errors.py:1744
5470
msgid "Too many redirections"
5473
#: bzrlib/errors.py:1749
5474
msgid "Working tree has conflicts."
5477
#: bzrlib/errors.py:1753
5478
msgid "Config file %(filename)s is not UTF-8 encoded\n"
5481
#: bzrlib/errors.py:1762
5483
"Error(s) parsing config file %(filename)s:\n"
5487
#: bzrlib/errors.py:1772
5489
"Bad value \"%(value)s\" for option \"%(name)s\".\n"
5490
"See ``bzr help %(name)s``"
5493
#: bzrlib/errors.py:1782
5494
msgid "%(username)r does not seem to contain a reasonable email address"
5497
#: bzrlib/errors.py:1791
5498
msgid "Failed to GPG sign data with command \"%(command_line)s\""
5501
#: bzrlib/errors.py:1799
5502
msgid "Failed to verify GPG signature data with error \"%(error)s\""
5505
#: bzrlib/errors.py:1807
5506
msgid "Unable to import library \"%(library)s\": %(error)s"
5509
#: bzrlib/errors.py:1815
5510
msgid "python-gpgme is not installed, it is needed to verify signatures"
5513
#: bzrlib/errors.py:1823
5515
"The working tree for %(basedir)s has changed since the last commit, but "
5516
"weave merge requires that it be unchanged"
5519
#: bzrlib/errors.py:1833
5521
"Can't reprocess and show base, because reprocessing obscures the "
5522
"relationship of conflicting lines to the base"
5525
#: bzrlib/errors.py:1839
5526
msgid "Cycle in graph %(graph)r"
5529
#: bzrlib/errors.py:1867
5530
msgid "File %(filename)s is not conflicted."
5533
#: bzrlib/errors.py:1889
5534
msgid "No bundle was found in \"%(filename)s\"."
5537
#: bzrlib/errors.py:1898
5538
msgid "Unable to handle bundle version %(version)s: %(msg)s"
5541
#: bzrlib/errors.py:1908
5542
msgid "Branch %(base)s is missing revision %(text_revision)s of %(file_id)s"
5545
#: bzrlib/errors.py:1921
5546
msgid "File id {%(file_id)s} already exists in inventory as %(entry)s"
5549
#: bzrlib/errors.py:1931
5550
msgid "Key %(key)s is already present in map"
5553
#: bzrlib/errors.py:1936
5554
msgid "The prefix %(prefix)s is in the help search path twice."
5557
#: bzrlib/errors.py:1946
5559
"No final name for trans_id %(trans_id)r\n"
5560
"file-id: %(file_id)r\n"
5561
"root trans-id: %(root_trans_id)r\n"
5564
#: bzrlib/errors.py:1978
5565
msgid "Attempt to reuse a transform that has already been applied."
5568
#: bzrlib/errors.py:1983
5569
msgid "Moving the root directory is not supported at this time"
5572
#: bzrlib/errors.py:1988
5573
msgid "Failed to rename %(from_path)s to %(to_path)s: %(why)s"
5576
#: bzrlib/errors.py:1999
5578
"Could not move %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s"
5581
#: bzrlib/errors.py:2035
5583
"Could not rename %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s"
5586
#: bzrlib/errors.py:2065
5587
msgid "Unable to import paramiko (required for sftp support): %(error)s"
5590
#: bzrlib/errors.py:2073
5591
msgid "Nothing to merge."
5594
#: bzrlib/errors.py:2078
5595
msgid "Format %(format)s cannot be initialised by this version of bzr."
5598
#: bzrlib/errors.py:2087
5600
"Cannot convert from format %(from_format)s to format %(format)s. "
5604
#: bzrlib/errors.py:2099
5605
msgid "Could not find an appropriate Differ for file \"%(path)s\""
5608
#: bzrlib/errors.py:2107
5609
msgid "%(exe_name)s could not be found on this machine"
5612
#: bzrlib/errors.py:2115
5613
msgid "Diff is not installed on this machine: %(msg)s"
5616
#: bzrlib/errors.py:2123
5617
msgid "Diff3 is not installed on this machine."
5620
#: bzrlib/errors.py:2129
5621
msgid "The content being inserted is already present."
5624
#: bzrlib/errors.py:2134
5626
"This tree contains left-over files from a failed operation.\n"
5627
" Please examine %(limbo_dir)s to see if it contains any files you wish "
5629
" keep, and delete it when you are done."
5632
#: bzrlib/errors.py:2145
5634
"This tree contains left-over files from a failed operation.\n"
5635
" Please examine %(pending_deletion)s to see if it contains any files you\n"
5636
" wish to keep, and delete it when you are done."
5639
#: bzrlib/errors.py:2155
5641
"Unable to delete transform temporary directory %(limbo_dir)s.\n"
5642
" Please examine %(limbo_dir)s to see if it contains any files you wish "
5644
" keep, and delete it when you are done."
5647
#: bzrlib/errors.py:2166
5649
"Unable to delete transform temporary directory %(pending_deletion)s. Please "
5650
"examine %(pending_deletion)s to see if it contains any files you wish to "
5651
"keep, and delete it when you are done."
5654
#: bzrlib/errors.py:2176
5655
msgid "Working tree is out of date, please run 'bzr update'.%(more)s"
5658
#: bzrlib/errors.py:2190
5660
"Public branch \"%(public_location)s\" lacks revision \"%(revstring)s\"."
5663
#: bzrlib/errors.py:2203
5664
msgid "Error in merge modified format"
5667
#: bzrlib/errors.py:2208
5668
msgid "Format error in conflict listings"
5671
#: bzrlib/errors.py:2212
5673
"Inconsistency in dirstate file %(dirstate_path)s.\n"
5674
"Error: %(description)s"
5677
#: bzrlib/errors.py:2223
5679
"An error has been detected in the repository %(repo_path)s.\n"
5680
"Please run bzr reconcile on this repository."
5683
#: bzrlib/errors.py:2234
5685
"An inconsistent delta was supplied involving %(path)r, %(file_id)r\n"
5686
"reason: %(reason)s"
5689
#: bzrlib/errors.py:2247
5691
"An inconsistent delta was supplied: %(delta)r\n"
5692
"reason: %(reason)s"
5695
#: bzrlib/errors.py:2259
5696
msgid "To use this feature you must upgrade your branch at %(path)s."
5699
#: bzrlib/errors.py:2268
5700
msgid "To use this feature you must upgrade your repository at %(path)s."
5703
#: bzrlib/errors.py:2273
5705
"To use this feature you must upgrade your branch at %(path)s to a format "
5706
"which supports rich roots."
5709
#: bzrlib/errors.py:2279
5710
msgid "Cannot perform local-only commits on unbound branches."
5713
#: bzrlib/errors.py:2284
5714
msgid "The method %(mname)s is not supported on objects of type %(tname)s."
5717
#: bzrlib/errors.py:2305
5718
msgid "Ghost tags not supported by format %(format)r."
5721
#: bzrlib/errors.py:2313
5722
msgid "File is binary but should be text."
5725
#: bzrlib/errors.py:2318
5726
msgid "The path %(path)s is not permitted on this platform"
5729
#: bzrlib/errors.py:2327
5731
"Testament did not match expected value.\n"
5732
" For revision_id {%(revision_id)s}, expected {%(expected)s}, measured\n"
5736
#: bzrlib/errors.py:2339
5737
msgid "Not a bzr revision-bundle: %(text)r"
5740
#: bzrlib/errors.py:2348
5741
msgid "Bad bzr revision-bundle: %(text)r"
5744
#: bzrlib/errors.py:2357
5745
msgid "Malformed bzr revision-bundle header: %(text)r"
5748
#: bzrlib/errors.py:2362
5749
msgid "Malformed patches in bzr revision-bundle: %(text)r"
5752
#: bzrlib/errors.py:2367
5753
msgid "Malformed footer in bzr revision-bundle: %(text)r"
5756
#: bzrlib/errors.py:2372
5757
msgid "End of line marker was not \\n in bzr revision-bundle"
5760
#: bzrlib/errors.py:2382
5761
msgid "Bundle format %(bundle_format)s is incompatible with %(other)s"
5764
#: bzrlib/errors.py:2392
5765
msgid "Root class for inventory serialization errors"
5768
#: bzrlib/errors.py:2396
5770
"The inventory was not in the expected format:\n"
5774
#: bzrlib/errors.py:2405
5775
msgid "This operation requires rich root data storage"
5778
#: bzrlib/errors.py:2418
5779
msgid "Unrecognised value for BZR_SSH environment variable: %(vendor)s"
5782
#: bzrlib/errors.py:2427
5784
"Don't know how to handle SSH connections. Please set BZR_SSH environment "
5788
#: bzrlib/errors.py:2434
5790
"Could not determine revno for {%(revision_id)s} because its ancestry shows a "
5791
"ghost at {%(ghost_revision_id)s}"
5794
#: bzrlib/errors.py:2444
5795
msgid "Ghost revision {%(revision_id)s} cannot be used here."
5798
#: bzrlib/errors.py:2495
5800
"A merge directive must provide either a bundle or a public branch location."
5803
#: bzrlib/errors.py:2502
5804
msgid "Bad merge directive payload %(start)r"
5807
#: bzrlib/errors.py:2512
5808
msgid "Preview patch does not match requested changes."
5811
#: bzrlib/errors.py:2518
5812
msgid "Patch_type was %(patch_type)s, but no patch was supplied."
5815
#: bzrlib/errors.py:2528
5817
"Your branch does not have all of the revisions required in order to merge "
5818
"this merge directive and the target location specified in the merge "
5819
"directive is not a branch: %(location)s."
5822
#: bzrlib/errors.py:2540
5823
msgid "Unsupported entry kind %(kind)s"
5826
#: bzrlib/errors.py:2548
5827
msgid "Can't subsume %(other_tree)s into %(tree)s. %(reason)s"
5830
#: bzrlib/errors.py:2558
5831
msgid "Subsume target %(other_tree)s needs to be upgraded."
5834
#: bzrlib/errors.py:2577
5835
msgid "No such tag: %(tag_name)s"
5838
#: bzrlib/errors.py:2585
5839
msgid "Tags not supported by %(branch)s; you may be able to use bzr upgrade."
5842
#: bzrlib/errors.py:2594
5843
msgid "Tag %(tag_name)s already exists."
5846
#: bzrlib/errors.py:2602
5848
"Did not understand bug identifier %(bug_id)s: %(reason)s. See \"bzr help "
5849
"bugs\" for more information on this feature."
5852
#: bzrlib/errors.py:2612
5854
"The URL for bug tracker \"%(abbreviation)s\" doesn't contain {id}: %(url)s"
5857
#: bzrlib/errors.py:2622
5859
"Cannot find registered bug tracker called %(abbreviation)s on %(branch)s"
5862
#: bzrlib/errors.py:2632
5863
msgid "Invalid line in bugs property: '%(line)s'"
5866
#: bzrlib/errors.py:2640
5867
msgid "Invalid bug status: '%(status)s'"
5870
#: bzrlib/errors.py:2648
5871
msgid "Could not understand response from smart server: %(response_tuple)r"
5874
#: bzrlib/errors.py:2687
5875
msgid "Server sent an unexpected error: %(error_tuple)r"
5878
#: bzrlib/errors.py:2706
5879
msgid "Unrecognised container format: %(container_format)r"
5882
#: bzrlib/errors.py:2714
5883
msgid "Unexpected end of container stream"
5886
#: bzrlib/errors.py:2719
5887
msgid "Unknown record type: %(record_type)r"
5890
#: bzrlib/errors.py:2727
5891
msgid "Invalid record: %(reason)s"
5894
#: bzrlib/errors.py:2735
5895
msgid "Container has data after end marker: %(excess)r"
5898
#: bzrlib/errors.py:2743
5899
msgid "Container has multiple records with the same name: %(name)s"
5902
#: bzrlib/errors.py:2756
5903
msgid "Corrupt or incompatible data stream: %(reason)s"
5906
#: bzrlib/errors.py:2764
5907
msgid "SMTP error: %(error)s"
5910
#: bzrlib/errors.py:2772
5911
msgid "No message supplied."
5914
#: bzrlib/errors.py:2777
5915
msgid "No mail-to address (--mail-to) or output (-o) specified."
5918
#: bzrlib/errors.py:2782
5920
"Unable to find mail client with the following names: "
5921
"%(mail_command_list_string)s"
5924
#: bzrlib/errors.py:2792
5925
msgid "SMTP connection to %(host)s refused"
5928
#: bzrlib/errors.py:2801
5929
msgid "Please specify smtp_server. No server at default %(host)s."
5932
#: bzrlib/errors.py:2815
5934
"'%(display_url)s' is not in sync with %(target_url)s. See bzr help sync-for-"
5938
#: bzrlib/errors.py:2827
5939
msgid "'%(display_url)s' is already a branch."
5942
#: bzrlib/errors.py:2832
5943
msgid "'%(display_url)s' is already a tree."
5946
#: bzrlib/errors.py:2837
5947
msgid "'%(display_url)s' is already a checkout."
5950
#: bzrlib/errors.py:2842
5951
msgid "'%(display_url)s' is already a lightweight checkout."
5954
#: bzrlib/errors.py:2847
5955
msgid "'%(display_url)s' is already using a shared repository."
5958
#: bzrlib/errors.py:2852
5959
msgid "'%(display_url)s' is already standalone."
5962
#: bzrlib/errors.py:2857
5963
msgid "Shared repository '%(display_url)s' already creates working trees."
5966
#: bzrlib/errors.py:2863
5968
"Shared repository '%(display_url)s' already doesn't create working trees."
5971
#: bzrlib/errors.py:2869
5972
msgid "Requested reconfiguration of '%(display_url)s' is not supported."
5975
#: bzrlib/errors.py:2874
5976
msgid "No location could be found to bind to at %(display_url)s."
5979
#: bzrlib/errors.py:2879
5981
"Working tree \"%(display_url)s\" has uncommitted changes (See bzr "
5985
#: bzrlib/errors.py:2898
5987
"Branch \"%(display_url)s\" does not support storing uncommitted changes."
5990
#: bzrlib/errors.py:2913
5992
"Working tree \"%(display_url)s\" has shelved changes (See bzr shelve --"
5996
#: bzrlib/errors.py:2919
5997
msgid "Variable {%(name)s} is not available."
6000
#: bzrlib/errors.py:2927
6001
msgid "No template specified."
6004
#: bzrlib/errors.py:2932
6005
msgid "Unable to create symlink %(path_str)son this platform"
6008
#: bzrlib/errors.py:2947
6010
"Unsupported timezone format \"%(timezone)s\", options are \"utc\", "
6011
"\"original\", \"local\"."
6014
#: bzrlib/errors.py:2981
6016
"Unable to encode %(kind)s path %(path)r in user encoding %(user_encoding)s"
6019
#: bzrlib/errors.py:2993
6020
msgid "The \"%(config_id)s\" configuration does not exist."
6023
#: bzrlib/errors.py:3001
6024
msgid "The \"%(option_name)s\" configuration option does not exist."
6027
#: bzrlib/errors.py:3009
6028
msgid "The alias \"%(alias_name)s\" does not exist."
6031
#: bzrlib/errors.py:3023
6032
msgid "\"%(alias_name)s\" is not a valid location alias."
6035
#: bzrlib/errors.py:3031
6036
msgid "No %(alias_name)s location assigned."
6039
#: bzrlib/errors.py:3039
6040
msgid "Cannot bind address \"%(host)s:%(port)i\": %(orig_error)s."
6043
#: bzrlib/errors.py:3049
6044
msgid "Unknown rules detected: %(unknowns_str)s."
6047
#: bzrlib/errors.py:3060
6048
msgid "Tip change rejected: %(msg)s"
6051
#: bzrlib/errors.py:3068
6052
msgid "Shelf corrupt."
6055
#: bzrlib/errors.py:3073
6056
msgid "Corruption while decompressing repository file%(orig_error)s"
6059
#: bzrlib/errors.py:3085
6060
msgid "No changes are shelved with id \"%(shelf_id)d\"."
6063
#: bzrlib/errors.py:3093
6064
msgid "\"%(invalid_id)s\" is not a valid shelf id, try a number instead."
6067
#: bzrlib/errors.py:3101
6069
"An attempt to access a url outside the server jail was made: '%(url)s'."
6072
#: bzrlib/errors.py:3109
6073
msgid "The user aborted the operation."
6076
#: bzrlib/errors.py:3114
6077
msgid "Branching '%(url)s'(%(format)s) must create a working tree."
6080
#: bzrlib/errors.py:3124
6081
msgid "No such view: %(view_name)s."
6084
#: bzrlib/errors.py:3134
6086
"Views are not supported by %(tree)s; use 'bzr upgrade' to change your tree "
6087
"to a later format."
6090
#: bzrlib/errors.py:3143
6092
"Specified file \"%(file_name)s\" is outside the current view: %(view_str)s"
6095
#: bzrlib/errors.py:3210
6096
msgid "%(bzrdir)r does not support co-located branches."
6099
#: bzrlib/errors.py:3216
6101
"Unable to determine your name.\n"
6102
"Please, set your name with the 'whoami' command.\n"
6103
"E.g. bzr whoami \"Your Name <name@example.com>\""
6106
#: bzrlib/errors.py:3225
6107
msgid "Invalid pattern(s) found. %(msg)s"
6110
#: bzrlib/errors.py:3233
6112
"Branch \"%(branch_url)s\" appears to be bound to itself. Please use `bzr "
6116
#: bzrlib/errors.py:3244
6117
msgid "Loop involving %(refs)r while expanding \"%(string)s\"."
6120
#: bzrlib/errors.py:3253
6121
msgid "Option %(name)s is not defined while expanding \"%(string)s\"."
6124
#: bzrlib/errors.py:3262
6126
"No compatible object available for operations from %(source)r to %(target)r."
6129
#: bzrlib/errors.py:3272
6131
"VFS requests over the smart server are not allowed. Encountered: %(method)s, "
6135
#: bzrlib/errors.py:3282
6137
"Kind change from %(from_kind)s to %(to_kind)s for %(path)s not supported by "
6141
#: bzrlib/errors.py:3294
6143
"Missing feature %(feature)s not provided by this version of Bazaar or any "
6147
#: bzrlib/errors.py:3307
6148
msgid "Binary files section encountered."
6151
#: bzrlib/errors.py:3315
6153
"Malformed patch header. %(desc)s\n"
6157
#: bzrlib/errors.py:3324
6159
"Malformed hunk header. %(desc)s\n"
6163
#: bzrlib/errors.py:3333
6165
"Malformed line. %(desc)s\n"
6169
#: bzrlib/errors.py:3343
6171
"Text contents mismatch at line %(line_no)d. Original has \"%(orig_line)s\", "
6172
"but patch says it should be \"%(patch_line)s\""
6175
#: bzrlib/errors.py:3354
6176
msgid "The feature %(feature)s has already been registered."
6179
#: bzrlib/errors.py:3362
6181
"Cannot store uncommitted changes because this branch already stores "
6182
"uncommitted changes."
6185
#: bzrlib/export_pot.py:252
6187
msgid "Exporting messages from builtin command: %s"
6190
#: bzrlib/export_pot.py:271
6191
msgid "Exporting messages from plugin command: {0} in {1}"
6194
#: bzrlib/export_pot.py:292
6196
msgid "Exporting message from error: %s"
6199
#: bzrlib/fetch.py:98
6200
msgid "Finding revisions"
6203
#: bzrlib/fetch.py:103
6204
msgid "Fetching revisions"
6207
#: bzrlib/foreign.py:262
6208
msgid "Push into a different VCS without any custom bzr metadata."
6211
#: bzrlib/foreign.py:264
6213
"This will afterwards rebase the local branch on the remote\n"
6214
"branch unless the --no-rebase option is used, in which case \n"
6215
"the two branches will be out of sync after the push. "
6218
#: bzrlib/foreign.py:277
6219
msgid "Do not rebase after push."
6222
#: bzrlib/foreign.py:311
6224
msgid "Using saved location: %s\n"
6227
#: bzrlib/foreign.py:321
6229
"{0!r} and {1!r} are in the same VCS, lossy push not necessary. Please use "
6233
#: bzrlib/gpg.py:366
6234
msgid "No GnuPG key results for pattern: {0}"
6237
#: bzrlib/gpg.py:439
6238
msgid "{0} commits with valid signatures"
6241
#: bzrlib/gpg.py:445
6242
msgid "{0} commit with unknown key"
6243
msgid_plural "{0} commits with unknown keys"
6247
#: bzrlib/gpg.py:453
6248
msgid "{0} commit not valid"
6249
msgid_plural "{0} commits not valid"
6253
#: bzrlib/gpg.py:461
6254
msgid "{0} commit not signed"
6255
msgid_plural "{0} commits not signed"
6259
#: bzrlib/gpg.py:469
6260
msgid "{0} commit with key now expired"
6261
msgid_plural "{0} commits with key now expired"
6265
#: bzrlib/gpg.py:489
6266
msgid "{0} commit by author {1} with key {2} now expired"
6267
msgid_plural "{0} commits by author {1} with key {2} now expired"
6271
#: bzrlib/gpg.py:505
6272
msgid "{0} signed {1} commit"
6273
msgid_plural "{0} signed {1} commits"
6277
#: bzrlib/gpg.py:522 bzrlib/gpg.py:539
6278
msgid "{0} commit by author {1}"
6279
msgid_plural "{0} commits by author {1}"
6283
#: bzrlib/gpg.py:554
6284
msgid "Unknown key {0} signed {1} commit"
6285
msgid_plural "Unknown key {0} signed {1} commits"
6289
#: bzrlib/groupcompress.py:1739
6291
msgid "Insert claimed random_id=True, but then inserted %r two times"
6294
#: bzrlib/hooks.py:313
6296
msgid "Introduced in: %s"
6299
#: bzrlib/hooks.py:316
6301
msgid "Deprecated in: %s"
6304
#: bzrlib/knit.py:1766 bzrlib/knit.py:1802
6305
msgid "Walking content"
6308
#: bzrlib/knit.py:3330
6312
#: bzrlib/lock.py:549
6313
msgid "{0!r} was {1} locked again"
6316
#: bzrlib/lockdir.py:321
6318
msgid "error removing pending lock: %s"
6321
#: bzrlib/lockdir.py:616
6322
msgid "Unable to obtain"
6325
#: bzrlib/lockdir.py:618
6326
msgid "Lock owner changed for"
6329
#: bzrlib/lockdir.py:620
6330
msgid "{0} lock {1} {2}."
6333
#: bzrlib/lockdir.py:627
6335
msgid "Will continue to try until %s, unless you press Ctrl-C."
6338
#: bzrlib/lockdir.py:629
6339
msgid "See \"bzr help break-lock\" for more."
6342
#: bzrlib/lockdir.py:739
6345
"held by %(user)s on %(hostname)s (process #%(pid)s), acquired %(time_ago)s"
6348
#: bzrlib/log.py:563
6349
msgid "--exclude-common-ancestry requires two different revisions"
6352
#: bzrlib/log.py:565
6354
msgid "invalid direction %r"
6357
#: bzrlib/log.py:653
6358
msgid "Start revision not found in history of end revision."
6361
#: bzrlib/log.py:1071 bzrlib/log.py:1129
6362
msgid "Logging revision 0 is invalid."
6365
#: bzrlib/log.py:1073 bzrlib/log.py:1131
6366
msgid "Start revision must be older than the end revision."
6369
#: bzrlib/log.py:1818
6371
msgid "unknown log formatter: %r"
6374
#: bzrlib/log.py:2114
6376
msgid_plural "fixes bugs"
6380
#: bzrlib/merge.py:689
6381
msgid "All changes applied successfully."
6384
#: bzrlib/merge.py:691
6386
msgid "%d conflicts encountered."
6389
#: bzrlib/merge.py:845 bzrlib/merge.py:1868
6390
msgid "Preparing file merge"
6393
#: bzrlib/multiparent.py:426
6394
msgid "Importing revisions"
6397
#: bzrlib/option.py:526
6398
msgid "Show help message."
6401
#: bzrlib/option.py:528
6402
msgid "Only display errors and warnings."
6405
#: bzrlib/option.py:531
6406
msgid "Show usage message and options."
6409
#: bzrlib/option.py:533
6410
msgid "Display more information."
6413
#: bzrlib/option.py:541
6415
"Select changes introduced by the specified revision. See also \"help "
6419
#: bzrlib/option.py:543
6420
msgid "Branch to operate on, instead of working directory."
6423
#: bzrlib/option.py:545
6424
msgid "Detailed log format."
6427
#: bzrlib/option.py:545
6428
msgid "Format used by GNU ChangeLog files."
6431
#: bzrlib/option.py:545
6432
msgid "Log format with one line per revision."
6435
#: bzrlib/option.py:545
6436
msgid "Moderately short log format."
6439
#: bzrlib/option.py:545
6440
msgid "Use specified log format."
6443
#: bzrlib/option.py:547
6447
#: bzrlib/option.py:549
6448
msgid "LCA-newness merge."
6451
#: bzrlib/option.py:549
6452
msgid "Merge using external diff3."
6455
#: bzrlib/option.py:549
6456
msgid "Native diff3-style merge."
6459
#: bzrlib/option.py:549
6460
msgid "Select a particular merge algorithm."
6463
#: bzrlib/option.py:549
6464
msgid "Weave-based merge."
6467
#: bzrlib/option.py:551
6468
msgid "Merge algorithm"
6471
#: bzrlib/option.py:554
6472
msgid "Message string."
6475
#: bzrlib/option.py:556
6476
msgid "Use an ASCII NUL (\\0) separator rather than a newline."
6479
#: bzrlib/option.py:558
6480
msgid "Ignore differences between branches and overwrite unconditionally."
6483
#: bzrlib/option.py:560
6484
msgid "Remember the specified location as a default."
6487
#: bzrlib/option.py:562
6488
msgid "Reprocess to reduce spurious conflicts."
6491
#: bzrlib/option.py:566
6492
msgid "See \"help revisionspec\" for details."
6495
#: bzrlib/option.py:568
6496
msgid "Show internal object ids."
6499
#: bzrlib/option.py:571
6500
msgid "Display timezone as local, original, or utc."
6503
#: bzrlib/osutils.py:100
6504
msgid "Parameter {0!r} encoding is unsupported by {1} application locale."
6507
#: bzrlib/osutils.py:220
6508
msgid "lstat/stat of ({0!r}): {1!r}"
6511
#: bzrlib/osutils.py:1030 bzrlib/osutils.py:1041
6513
msgid "sorry, %r not allowed in path"
6516
#: bzrlib/osutils.py:1259
6518
msgid "%r is too short to calculate a relative path"
6521
#: bzrlib/plugin.py:143
6523
msgid "\"%s\" is not a valid <plugin_name>@<plugin_path> description "
6526
#: bzrlib/plugins/bash_completion/bashcomp.py:411
6527
msgid "Enable completions for the selected plugin (default: all plugins)"
6530
#: bzrlib/plugins/bash_completion/bashcomp.py:412
6531
msgid "Generate a shell function for bash command line completion."
6534
#: bzrlib/plugins/bash_completion/bashcomp.py:414
6536
"This command generates a shell function which can be used by bash to\n"
6537
"automatically complete the currently typed command when the user presses\n"
6538
"the completion key (usually tab)."
6541
#: bzrlib/plugins/bash_completion/bashcomp.py:418
6543
"Commonly used like this:\n"
6544
" eval \"`bzr bash-completion`\""
6547
#: bzrlib/plugins/bash_completion/bashcomp.py:424
6548
msgid "Name of the generated function (default: _bzr)"
6551
#: bzrlib/plugins/bash_completion/bashcomp.py:426
6552
msgid "Generate only the shell function, don't enable it"
6555
#: bzrlib/plugins/grep/cmds.py:77
6556
msgid "Print lines matching PATTERN for specified files and revisions."
6559
#: bzrlib/plugins/grep/cmds.py:79
6561
"This command searches the specified files and revisions for a given\n"
6562
"pattern. The pattern is specified as a Python regular expressions[1]."
6565
#: bzrlib/plugins/grep/cmds.py:82
6567
"If the file name is not specified, the revisions starting with the\n"
6568
"current directory are searched recursively. If the revision number is\n"
6569
"not specified, the working copy is searched. To search the last committed\n"
6570
"revision, use the '-r -1' or '-r last:1' option."
6573
#: bzrlib/plugins/grep/cmds.py:87
6575
"Unversioned files are not searched unless explicitly specified on the\n"
6576
"command line. Unversioned directores are not searched."
6579
#: bzrlib/plugins/grep/cmds.py:90
6581
"When searching a pattern, the output is shown in the 'filepath:string'\n"
6582
"format. If a revision is explicitly searched, the output is shown as\n"
6583
"'filepath~N:string', where N is the revision number."
6586
#: bzrlib/plugins/grep/cmds.py:94
6588
"--include and --exclude options can be used to search only (or exclude\n"
6589
"from search) files with base name matches the specified Unix style GLOB\n"
6590
"pattern. The GLOB pattern an use *, ?, and [...] as wildcards, and \\\n"
6591
"to quote wildcard or backslash character literally. Note that the glob\n"
6592
"pattern is not a regular expression."
6595
#: bzrlib/plugins/grep/cmds.py:100
6596
msgid "[1] http://docs.python.org/library/re.html#regular-expression-syntax"
6599
#: bzrlib/plugins/grep/cmds.py:109
6600
msgid "Show match in color. WHEN is never, always or auto."
6603
#: bzrlib/plugins/grep/cmds.py:111
6604
msgid "Grep for pattern in changeset for each revision."
6607
#: bzrlib/plugins/grep/cmds.py:113
6608
msgid "Skip files whose base name matches GLOB."
6611
#: bzrlib/plugins/grep/cmds.py:115
6612
msgid "Search only files whose base name matches GLOB."
6615
#: bzrlib/plugins/grep/cmds.py:117
6616
msgid "Print only the name of each input file in which PATTERN is found."
6619
#: bzrlib/plugins/grep/cmds.py:120
6620
msgid "Print only the name of each input file in which PATTERN is not found."
6623
#: bzrlib/plugins/grep/cmds.py:123
6624
msgid "Interpret PATTERN is a single fixed string (not regex)."
6627
#: bzrlib/plugins/grep/cmds.py:125
6629
"Search for pattern starting from the root of the branch. (implies --"
6633
#: bzrlib/plugins/grep/cmds.py:128
6634
msgid "ignore case distinctions while matching."
6637
#: bzrlib/plugins/grep/cmds.py:130
6639
"Number of levels to display - 0 for all, 1 for collapsed (1 is default)."
6642
#: bzrlib/plugins/grep/cmds.py:135
6643
msgid "show 1-based line number."
6646
#: bzrlib/plugins/grep/cmds.py:137
6647
msgid "Don't recurse into subdirectories. (default is --recursive)"
6650
#: bzrlib/plugins/grep/cmds.py:139
6652
"Write an ASCII NUL (\\0) separator between output lines rather than a "
6656
#: bzrlib/plugins/launchpad/account.py:66
6657
msgid "Setting ssh/sftp usernames for launchpad.net."
6660
#: bzrlib/plugins/launchpad/cmds.py:43
6661
msgid "Register a branch with launchpad.net."
6664
#: bzrlib/plugins/launchpad/cmds.py:45
6666
"This command lists a bzr branch in the directory of branches on\n"
6667
"launchpad.net. Registration allows the branch to be associated with\n"
6668
"bugs or specifications."
6671
#: bzrlib/plugins/launchpad/cmds.py:49
6673
"Before using this command you must register the project to which the\n"
6674
"branch belongs, and create an account for yourself on launchpad.net."
6677
#: bzrlib/plugins/launchpad/cmds.py:52
6680
" public_url: The publicly visible url for the branch to register.\n"
6681
" This must be an http or https url (which Launchpad can read\n"
6682
" from to access the branch). Local file urls, SFTP urls, and\n"
6683
" bzr+ssh urls will not work.\n"
6684
" If no public_url is provided, bzr will use the configured\n"
6685
" public_url if there is one for the current branch, and\n"
6689
#: bzrlib/plugins/launchpad/cmds.py:61
6692
" bzr register-branch http://foo.com/bzr/fooproject.mine \\\n"
6693
" --project fooproject"
6696
#: bzrlib/plugins/launchpad/cmds.py:68
6697
msgid "Launchpad project short name to associate with the branch."
6700
#: bzrlib/plugins/launchpad/cmds.py:75
6702
"Short name for the branch; by default taken from the last component of the "
6706
#: bzrlib/plugins/launchpad/cmds.py:79
6707
msgid "One-sentence description of the branch."
6710
#: bzrlib/plugins/launchpad/cmds.py:82
6711
msgid "Longer description of the purpose or contents of the branch."
6714
#: bzrlib/plugins/launchpad/cmds.py:85
6715
msgid "Branch author's email address, if not yourself."
6718
#: bzrlib/plugins/launchpad/cmds.py:88
6719
msgid "The bug this branch fixes."
6722
#: bzrlib/plugins/launchpad/cmds.py:91
6723
msgid "Prepare the request but don't actually send it."
6726
#: bzrlib/plugins/launchpad/cmds.py:113
6728
"register-branch requires a public branch url - see bzr help register-branch."
6731
#: bzrlib/plugins/launchpad/cmds.py:121
6732
msgid "--product is deprecated; please use --project."
6735
#: bzrlib/plugins/launchpad/cmds.py:151
6736
msgid "Open a Launchpad branch page in your web browser."
6739
#: bzrlib/plugins/launchpad/cmds.py:156
6740
msgid "Do not actually open the browser. Just say the URL we would use."
6743
#: bzrlib/plugins/launchpad/cmds.py:191
6745
msgid "Opening %s in web browser"
6748
#: bzrlib/plugins/launchpad/cmds.py:199
6749
msgid "Show or set the Launchpad user ID."
6752
#: bzrlib/plugins/launchpad/cmds.py:201
6754
"When communicating with Launchpad, some commands need to know your\n"
6755
"Launchpad user ID. This command can be used to set or show the\n"
6756
"user ID that Bazaar will use for such communication."
6759
#: bzrlib/plugins/launchpad/cmds.py:205
6762
" Show the Launchpad ID of the current user::"
6765
#: bzrlib/plugins/launchpad/cmds.py:208
6766
msgid " bzr launchpad-login"
6769
#: bzrlib/plugins/launchpad/cmds.py:210
6770
msgid " Set the Launchpad ID of the current user to 'bob'::"
6773
#: bzrlib/plugins/launchpad/cmds.py:212
6774
msgid " bzr launchpad-login bob"
6777
#: bzrlib/plugins/launchpad/cmds.py:219
6778
msgid "Don't check that the user name is valid."
6781
#: bzrlib/plugins/launchpad/cmds.py:234 bzrlib/plugins/launchpad/cmds.py:245
6782
msgid "Launchpad user ID exists and has SSH keys.\n"
6785
#: bzrlib/plugins/launchpad/cmds.py:237
6786
msgid "No Launchpad user ID configured.\n"
6789
#: bzrlib/plugins/launchpad/cmds.py:248
6791
msgid "Launchpad user ID set to '%s'.\n"
6794
#: bzrlib/plugins/launchpad/cmds.py:254
6795
msgid "Ask Launchpad to mirror a branch now."
6798
#: bzrlib/plugins/launchpad/cmds.py:271
6799
msgid "Propose merging a branch on Launchpad."
6802
#: bzrlib/plugins/launchpad/cmds.py:273
6804
"This will open your usual editor to provide the initial comment. When it\n"
6805
"has created the proposal, it will open it in your default web browser."
6808
#: bzrlib/plugins/launchpad/cmds.py:276
6810
"The branch will be proposed to merge into SUBMIT_BRANCH. If SUBMIT_BRANCH\n"
6811
"is not supplied, the remembered submit branch will be used. If no submit\n"
6812
"branch is remembered, the development focus will be used."
6815
#: bzrlib/plugins/launchpad/cmds.py:280
6817
"By default, the SUBMIT_BRANCH's review team will be requested to review\n"
6818
"the merge proposal. This can be overriden by specifying --review (-R).\n"
6819
"The parameter the launchpad account name of the desired reviewer. This\n"
6820
"may optionally be followed by '=' and the review type. For example:"
6823
#: bzrlib/plugins/launchpad/cmds.py:285
6824
msgid " bzr lp-propose-merge --review jrandom --review review-team=qa"
6827
#: bzrlib/plugins/launchpad/cmds.py:287
6829
"This will propose a merge, request \"jrandom\" to perform a review of\n"
6830
"unspecified type, and request \"review-team\" to perform a \"qa\" review."
6833
#: bzrlib/plugins/launchpad/cmds.py:292
6834
msgid "Propose the merge on staging."
6837
#: bzrlib/plugins/launchpad/cmds.py:294
6838
msgid "Commit message."
6841
#: bzrlib/plugins/launchpad/cmds.py:296
6843
"Mark the proposal as approved immediately, setting the approved revision to "
6847
#: bzrlib/plugins/launchpad/cmds.py:298
6848
msgid "The bug this proposal fixes."
6851
#: bzrlib/plugins/launchpad/cmds.py:300
6852
msgid "Requested reviewer and optional type."
6855
#: bzrlib/plugins/launchpad/cmds.py:335
6856
msgid "Find the proposal to merge this revision."
6859
#: bzrlib/plugins/launchpad/cmds.py:337
6861
"Finds the merge proposal(s) that discussed landing the specified revision.\n"
6862
"This works only if the if the merged_revno was recorded for the merge\n"
6863
"proposal. The proposal(s) are opened in a web browser."
6866
#: bzrlib/plugins/launchpad/cmds.py:341
6868
"Only the revision specified is searched for. To find the mainline\n"
6869
"revision that merged it into mainline, use the \"mainline\" revision spec."
6872
#: bzrlib/plugins/launchpad/cmds.py:344
6873
msgid "So, to find the merge proposal that reviewed line 1 of README::"
6876
#: bzrlib/plugins/launchpad/cmds.py:346
6877
msgid " bzr lp-find-proposal -r mainline:annotate:README:1"
6880
#: bzrlib/plugins/launchpad/cmds.py:365
6881
msgid "No review found."
6884
#: bzrlib/plugins/launchpad/cmds.py:366
6886
msgid "%d proposals(s) found."
6889
#: bzrlib/plugins/launchpad/cmds.py:378
6890
msgid "Finding proposals"
6893
#: bzrlib/plugins/launchpad/lp_api.py:228
6894
#: bzrlib/plugins/launchpad/lp_api.py:233
6896
msgid "%s is not registered on Launchpad"
6899
#: bzrlib/plugins/launchpad/lp_api.py:243
6901
msgid "%s has no development focus."
6904
#: bzrlib/plugins/launchpad/lp_api.py:248
6906
msgid "development focus %s has no branch."
6909
#: bzrlib/plugins/launchpad/lp_api.py:253
6911
msgid "source package %s has no branch."
6914
#: bzrlib/plugins/launchpad/lp_api.py:257
6916
msgid "%s has no associated product or source package."
6919
#: bzrlib/plugins/launchpad/lp_api.py:269
6921
msgid "%s is already up-to-date."
6924
#: bzrlib/plugins/launchpad/lp_api.py:276
6926
msgid "Pushing to %s"
6929
#: bzrlib/plugins/launchpad/lp_directory.py:170
6931
"resolution for {0}\n"
6936
#: bzrlib/plugins/launchpad/lp_propose.py:159
6938
msgid "There is already a branch merge proposal: %s"
6941
#: bzrlib/plugins/weave_fmt/bzrdir.py:237
6942
msgid "pb parameter to convert() is deprecated"
6945
#: bzrlib/plugins/weave_fmt/bzrdir.py:240
6946
msgid "starting upgrade from format 4 to 5"
6949
#: bzrlib/plugins/weave_fmt/bzrdir.py:250
6950
msgid "note: upgrade may be faster if all store files are ungzipped first"
6953
#: bzrlib/plugins/weave_fmt/bzrdir.py:279
6954
msgid "converting revision"
6957
#: bzrlib/plugins/weave_fmt/bzrdir.py:284
6958
msgid "upgraded to weaves:"
6961
#: bzrlib/plugins/weave_fmt/bzrdir.py:285
6963
msgid "%6d revisions and inventories"
6966
#: bzrlib/plugins/weave_fmt/bzrdir.py:287
6968
msgid "%6d revisions not present"
6971
#: bzrlib/plugins/weave_fmt/bzrdir.py:289
6976
#: bzrlib/plugins/weave_fmt/bzrdir.py:325
6977
msgid "writing weave"
6980
#: bzrlib/plugins/weave_fmt/bzrdir.py:329
6981
#: bzrlib/plugins/weave_fmt/bzrdir.py:331
6985
#: bzrlib/plugins/weave_fmt/bzrdir.py:348
6986
msgid "write revision"
6989
#: bzrlib/plugins/weave_fmt/bzrdir.py:362
6990
msgid "loading revision"
6993
#: bzrlib/plugins/weave_fmt/bzrdir.py:367
6995
msgid "revision {%s} not present in branch; will be converted as a ghost"
6998
#: bzrlib/plugins/weave_fmt/bzrdir.py:507
6999
msgid "starting upgrade from format 5 to 6"
7002
#: bzrlib/plugins/weave_fmt/bzrdir.py:517
7004
msgid "adding prefixes to %s"
7007
#: bzrlib/plugins/weave_fmt/bzrdir.py:557
7008
msgid "starting upgrade from format 6 to metadir"
7011
#: bzrlib/plugins/weave_fmt/bzrdir.py:565
7012
msgid "Removing ancestry.weave"
7015
#: bzrlib/plugins/weave_fmt/bzrdir.py:570
7016
msgid "Finding branch files"
7019
#: bzrlib/plugins/weave_fmt/bzrdir.py:580
7020
msgid "Upgrading repository"
7023
#: bzrlib/plugins/weave_fmt/bzrdir.py:590
7024
msgid "Upgrading branch"
7027
#: bzrlib/plugins/weave_fmt/bzrdir.py:613
7028
msgid "No working tree."
7031
#: bzrlib/plugins/weave_fmt/bzrdir.py:620
7032
msgid "Upgrading working tree"
7035
#: bzrlib/plugins/weave_fmt/bzrdir.py:641
7037
msgid "Make %s lock"
7040
#: bzrlib/plugins/weave_fmt/bzrdir.py:652
7045
#: bzrlib/push.py:56
7046
msgid "Created new branch."
7049
#: bzrlib/push.py:97
7052
"Target directory %s already contains a .bzr directory, but it is not valid."
7055
#: bzrlib/push.py:101
7058
"Target directory %s already exists, but does not have a .bzr directory. "
7059
"Supply --use-existing-dir to push there anyway."
7062
#: bzrlib/push.py:122
7064
msgid "Too many redirections trying to make %s."
7067
#: bzrlib/push.py:148
7069
"These branches have diverged. See \"bzr help diverged-branches\" for more "
7073
#: bzrlib/push.py:152
7076
"It is not possible to losslessly push to %s. You may want to use dpush "
7080
#: bzrlib/push.py:158
7083
"At %s you have a valid .bzr control directory, but not a branch or "
7084
"repository. This is an unsupported configuration. Please move the target "
7085
"directory out of the way and try again."
7088
#: bzrlib/reconcile.py:97
7090
msgid "Reconciling branch %s"
7093
#: bzrlib/reconcile.py:103
7095
msgid "Reconciling repository %s"
7098
#: bzrlib/reconcile.py:105
7099
msgid "Reconciling repository"
7102
#: bzrlib/reconcile.py:111
7104
msgid "%s cannot canonicalize CHKs."
7107
#: bzrlib/reconcile.py:119
7108
msgid "Reconcile aborted: revision index has inconsistent parents."
7111
#: bzrlib/reconcile.py:121
7112
msgid "Run \"bzr check\" for more details."
7115
#: bzrlib/reconcile.py:123
7116
msgid "Reconciliation complete."
7119
#: bzrlib/reconcile.py:166
7120
msgid "Fixing last revision info {0} => {1}"
7123
#: bzrlib/reconcile.py:173
7124
msgid "revision_history ok."
7127
#: bzrlib/reconcile.py:234
7128
msgid "Reading inventory data"
7131
#: bzrlib/reconcile.py:254 bzrlib/reconcile.py:384
7132
msgid "Inventory ok."
7135
#: bzrlib/reconcile.py:256 bzrlib/reconcile.py:386
7136
msgid "Backing up inventory"
7139
#: bzrlib/reconcile.py:258
7140
msgid "Backup inventory created."
7143
#: bzrlib/reconcile.py:274 bzrlib/reconcile.py:405
7144
msgid "Writing weave"
7147
#: bzrlib/reconcile.py:277 bzrlib/reconcile.py:408
7148
msgid "Inventory regenerated."
7151
#: bzrlib/reconcile.py:371 bzrlib/reconcile.py:373 bzrlib/reconcile.py:376
7152
msgid "Reading indexes"
7155
#: bzrlib/reconcile.py:380 bzrlib/reconcile.py:382
7156
msgid "Checking unused inventories"
7159
#: bzrlib/reconcile.py:388
7160
msgid "Backup Inventory created"
7163
#: bzrlib/reconcile.py:446
7164
msgid "Fixing text parents"
7167
#: bzrlib/reconfigure.py:54
7168
msgid "{0} is now stacked on {1}\n"
7171
#: bzrlib/reconfigure.py:69
7173
msgid "%s is now not stacked\n"
7176
#: bzrlib/remote.py:1228 bzrlib/repository.py:289
7178
msgid "bzr: ERROR (ignored): %s"
7181
#: bzrlib/remote.py:2534
7182
msgid "Copying repository content as tarball..."
7185
#: bzrlib/rename_map.py:69
7186
msgid "Calculating hashes"
7189
#: bzrlib/rename_map.py:107
7190
msgid "Determining hash hits"
7193
#: bzrlib/rename_map.py:242
7197
#: bzrlib/repository.py:1738
7198
msgid "Moving repository to repository.backup"
7201
#: bzrlib/repository.py:1745
7202
msgid "Creating new repository"
7205
#: bzrlib/repository.py:1750
7206
msgid "Copying content"
7209
#: bzrlib/repository.py:1754
7210
msgid "Deleting old repository content"
7213
#: bzrlib/repository.py:1756
7214
msgid "repository converted"
7217
#: bzrlib/revisionspec.py:903
7218
msgid "Using {0} {1}"
7221
#: bzrlib/send.py:59
7223
msgid "Mail client \"%s\" does not support specifying body"
7226
#: bzrlib/send.py:63
7227
msgid "--remember requires a branch to be specified."
7230
#: bzrlib/send.py:78
7231
msgid "No submit branch known or specified"
7234
#: bzrlib/send.py:81
7235
msgid "Using saved {0} location \"{1}\" to determine what changes to submit."
7238
#: bzrlib/send.py:99
7240
msgid "No such send format '%s'."
7243
#: bzrlib/send.py:115
7244
msgid "bzr send takes at most two one revision identifiers"
7247
#: bzrlib/send.py:128
7248
msgid "No revisions to submit."
7251
#: bzrlib/send.py:140
7253
"- not supported for merge directives that use more than one output file."
7256
#: bzrlib/send.py:186
7257
msgid "Format 0.9 does not permit bundle with no patch"
7260
#: bzrlib/shelf_ui.py:46
7262
msgid "Shelve adding file \"%(path)s\"?"
7265
#: bzrlib/shelf_ui.py:47
7266
msgid "Shelve binary changes?"
7269
#: bzrlib/shelf_ui.py:48
7270
msgid "Shelve changing \"%s\" from %(other)s to %(this)s?"
7273
#: bzrlib/shelf_ui.py:50
7275
msgid "Shelve removing file \"%(path)s\"?"
7278
#: bzrlib/shelf_ui.py:51
7280
msgid "Shelve %d change(s)?"
7283
#: bzrlib/shelf_ui.py:52
7287
#: bzrlib/shelf_ui.py:53
7290
"Shelve changing target of \"%(path)s\" from \"%(other)s\" to \"%(this)s\"?"
7293
#: bzrlib/shelf_ui.py:55
7295
msgid "Shelve renaming \"%(other)s\" => \"%(this)s\"?"
7298
#: bzrlib/shelf_ui.py:70
7300
msgid "Changes shelved with id \"%d\"."
7303
#: bzrlib/shelf_ui.py:74
7304
msgid "Selected changes destroyed."
7307
#: bzrlib/shelf_ui.py:78
7308
msgid "Selected changes:"
7311
#: bzrlib/shelf_ui.py:98
7313
msgid "Delete file \"%(path)s\"?"
7316
#: bzrlib/shelf_ui.py:99
7317
msgid "Apply binary changes?"
7320
#: bzrlib/shelf_ui.py:100
7322
msgid "Change \"%(path)s\" from %(this)s to %(other)s?"
7325
#: bzrlib/shelf_ui.py:102
7327
msgid "Add file \"%(path)s\"?"
7330
#: bzrlib/shelf_ui.py:103
7332
msgid "Apply %d change(s)?"
7335
#: bzrlib/shelf_ui.py:104
7336
msgid "Apply change?"
7339
#: bzrlib/shelf_ui.py:105
7341
msgid "Change target of \"%(path)s\" from \"%(this)s\" to \"%(other)s\"?"
7344
#: bzrlib/shelf_ui.py:107
7346
msgid "Rename \"%(this)s\" => \"%(other)s\"?"
7349
#: bzrlib/shelf_ui.py:402
7350
msgid "No changes are shelved."
7353
#: bzrlib/shelf_ui.py:460
7355
msgid "Using changes with id \"%d\"."
7358
#: bzrlib/shelf_ui.py:464
7363
#: bzrlib/shelf_ui.py:476
7365
msgid "Deleted changes with id \"%d\"."
7368
#: bzrlib/smart/medium.py:714
7369
msgid "HPSS calls: {0} ({1} vfs) {2}"
7372
#: bzrlib/smart/ping.py:32
7373
msgid "Pings a Bazaar smart server."
7376
#: bzrlib/smart/ping.py:34
7378
"This command sends a 'hello' request to the given location using the bzr\n"
7379
"smart protocol, and reports the response."
7382
#: bzrlib/smart/server.py:169
7383
msgid "Requested to stop gracefully"
7386
#: bzrlib/smart/server.py:179
7388
msgid "Waiting for %d client(s) to finish"
7391
#: bzrlib/smart/server.py:185
7393
msgid "Still waiting for %d client(s) to finish"
7396
#: bzrlib/smart/server.py:219
7398
msgid "listening socket error: %s"
7401
#: bzrlib/smart/server.py:452
7403
msgid "listening on port: %s"
7406
#: bzrlib/switch.py:84
7407
msgid "Pending merges must be committed or reverted before using switch."
7410
#: bzrlib/switch.py:111
7412
"Cannot switch as local commits found in the checkout. Commit these to the "
7413
"bound branch or use --force to throw them away."
7416
#: bzrlib/switch.py:116
7419
"Unable to connect to current master branch %(target)s: %(error)s To switch "
7420
"anyway, use --force."
7423
#: bzrlib/switch.py:140
7424
msgid "Cannot switch a branch, only a checkout."
7427
#: bzrlib/switch.py:183
7429
msgid "Tree is up to date at revision %d."
7432
#: bzrlib/switch.py:190
7434
msgid "Updated to revision %d."
7437
#: bzrlib/transform.py:1723 bzrlib/transform.py:1734 bzrlib/transform.py:1736
7441
#: bzrlib/transform.py:1762 bzrlib/transform.py:1830
7442
msgid "removing file"
7445
#: bzrlib/transform.py:1780 bzrlib/transform.py:1865
7449
#: bzrlib/transform.py:2598
7450
msgid "Building tree"
7453
#: bzrlib/transform.py:2688 bzrlib/transform.py:2715
7454
msgid "Adding file contents"
7457
#: bzrlib/transform.py:3017
7458
msgid "Resolution pass"
7461
#: bzrlib/transport/ftp/_gssapi.py:88
7463
msgid "Authenticated as %s"
7466
#: bzrlib/tree.py:647
7467
msgid "*** {0} content-filter: {1} => {2!r}"
7470
#: bzrlib/upgrade.py:77
7472
msgid "This is a checkout. The branch (%s) needs to be upgraded separately."
7475
#: bzrlib/upgrade.py:100
7477
msgid "cannot upgrade from bzrdir format %s"
7480
#: bzrlib/upgrade.py:103
7482
msgid "starting upgrade of %s"
7485
#: bzrlib/upgrade.py:110
7489
#: bzrlib/upgrade.py:120
7490
msgid "Deleting backup.bzr"
7493
#: bzrlib/upgrade.py:151
7496
"SUMMARY: {0} upgrades attempted, {1} succeeded, {2} failed"
7499
#: bzrlib/upgrade.py:208
7501
msgid "Found %d dependent branches - upgrading ..."
7504
#: bzrlib/upgrade.py:276
7505
msgid "Upgrading bzrdirs"
7508
#: bzrlib/upgrade.py:282
7510
msgid "Upgrading %s"
7513
#: bzrlib/upgrade.py:283
7514
msgid "Upgrading {0} {1} ..."
7517
#: bzrlib/upgrade.py:301
7518
msgid "Removing backup ..."
7521
#: bzrlib/upgrade.py:305
7522
msgid "failed to clean-up {0}: {1}"
7525
#: bzrlib/vf_repository.py:1091
7529
#: bzrlib/vf_repository.py:1117
7533
#: bzrlib/vf_repository.py:1622 bzrlib/vf_repository.py:1631
7534
msgid "Calculating text parents"
7537
#: bzrlib/vf_repository.py:1707
7541
#: bzrlib/vf_repository.py:2536
7542
msgid "loading text store"
7545
#: bzrlib/vf_repository.py:2542
7546
msgid "checking text graph"
7549
#: bzrlib/vf_repository.py:2998 bzrlib/vf_repository.py:3012
7550
#: bzrlib/vf_repository.py:3127
7551
msgid "Transferring revisions"
7554
#: bzrlib/win32utils.py:146
7555
msgid "Failed to GetProcessMemoryInfo()"
7558
#: bzrlib/win32utils.py:167
7559
msgid "Cannot debug memory on win32 without ctypes or win32process"
7562
#: bzrlib/win32utils.py:172
7563
msgid "WorkingSize {0:>7}KiB\tPeakWorking {1:>7}KiB\t{2}"
7566
#: bzrlib/win32utils.py:180
7568
msgid "WorkingSize %8d KiB"
7571
#: bzrlib/win32utils.py:181
7573
msgid "PeakWorking %8d KiB"
7576
#: bzrlib/win32utils.py:182
7578
msgid "PagefileUsage %8d KiB"
7581
#: bzrlib/win32utils.py:183
7583
msgid "PeakPagefileUsage %8d KiB"
7586
#: bzrlib/win32utils.py:185
7588
msgid "PrivateUsage %8d KiB"
7591
#: bzrlib/win32utils.py:186
7593
msgid "PageFaultCount %8d"
7596
#: bzrlib/workingtree.py:1516
7597
msgid "Rerun update after fixing the conflicts."
7600
#: dummy/help_topics/authentication/summary.txt:1
7601
msgid "Information on configuring authentication"
7604
#: dummy/help_topics/basic/detail.txt:1
7606
"Bazaar 2.6.0 -- a free distributed version-control tool\n"
7607
"http://bazaar.canonical.com/"
7610
#: dummy/help_topics/basic/detail.txt:4
7613
" bzr init makes this directory a versioned branch\n"
7614
" bzr branch make a copy of another branch"
7617
#: dummy/help_topics/basic/detail.txt:8
7619
" bzr add make files or directories versioned\n"
7620
" bzr ignore ignore a file or pattern\n"
7621
" bzr mv move or rename a versioned file"
7624
#: dummy/help_topics/basic/detail.txt:12
7626
" bzr status summarize changes in working copy\n"
7627
" bzr diff show detailed diffs"
7630
#: dummy/help_topics/basic/detail.txt:15
7632
" bzr merge pull in changes from another branch\n"
7633
" bzr commit save some or all changes\n"
7634
" bzr send send changes via email"
7637
#: dummy/help_topics/basic/detail.txt:19
7639
" bzr log show history of changes\n"
7640
" bzr check validate storage"
7643
#: dummy/help_topics/basic/detail.txt:22
7645
" bzr help init more help on e.g. init command\n"
7646
" bzr help commands list all commands\n"
7647
" bzr help topics list all help topics\n"
7650
#: dummy/help_topics/basic/summary.txt:1
7651
msgid "Basic commands"
7654
#: dummy/help_topics/branches/detail.txt:1
7658
#: dummy/help_topics/branches/detail.txt:3
7660
"A branch consists of the state of a project, including all of its\n"
7661
"history. All branches have a repository associated (which is where the\n"
7662
"branch history is stored), but multiple branches may share the same\n"
7663
"repository (a shared repository). Branches can be copied and merged."
7666
#: dummy/help_topics/branches/detail.txt:8
7668
"In addition, one branch may be bound to another one. Binding to another\n"
7669
"branch indicates that commits which happen in this branch must also \n"
7670
"happen in the other branch. Bazaar ensures consistency by not allowing \n"
7671
"commits when the two branches are out of date. In order for a commit \n"
7672
"to succeed, it may be necessary to update the current branch using \n"
7676
#: dummy/help_topics/branches/detail.txt:15
7677
#: dummy/help_topics/checkouts/detail.txt:66
7678
#: dummy/help_topics/repositories/detail.txt:36
7679
msgid "Related commands::"
7682
#: dummy/help_topics/branches/detail.txt:17
7684
" init Change a directory into a versioned branch.\n"
7685
" branch Create a new branch that is a copy of an existing branch.\n"
7686
" merge Perform a three-way merge.\n"
7687
" bind Bind a branch to another one.\n"
7690
#: dummy/help_topics/branches/summary.txt:1
7691
msgid "Information on what a branch is"
7694
#: dummy/help_topics/bugs/summary.txt:1
7695
msgid "Bug tracker settings"
7698
#: dummy/help_topics/checkouts/detail.txt:1
7702
#: dummy/help_topics/checkouts/detail.txt:3
7704
"Checkouts are source trees that are connected to a branch, so that when\n"
7705
"you commit in the source tree, the commit goes into that branch. They\n"
7706
"allow you to use a simpler, more centralized workflow, ignoring some of\n"
7707
"Bazaar's decentralized features until you want them. Using checkouts\n"
7708
"with shared repositories is very similar to working with SVN or CVS, but\n"
7709
"doesn't have the same restrictions. And using checkouts still allows\n"
7710
"others working on the project to use whatever workflow they like."
7713
#: dummy/help_topics/checkouts/detail.txt:11
7715
"A checkout is created with the bzr checkout command (see \"help "
7717
"You pass it a reference to another branch, and it will create a local copy\n"
7718
"for you that still contains a reference to the branch you created the\n"
7719
"checkout from (the master branch). Then if you make any commits they will "
7721
"made on the other branch first. This creates an instant mirror of your work, "
7723
"facilitates lockstep development, where each developer is working together,\n"
7724
"continuously integrating the changes of others."
7727
#: dummy/help_topics/checkouts/detail.txt:19
7729
"However the checkout is still a first class branch in Bazaar terms, so that\n"
7730
"you have the full history locally. As you have a first class branch you "
7732
"also commit locally if you want, for instance due to the temporary loss af "
7734
"network connection. Use the --local option to commit to do this. All the "
7736
"commits will then be made on the master branch the next time you do a non-"
7741
#: dummy/help_topics/checkouts/detail.txt:26
7743
"If you are using a checkout from a shared branch you will periodically want "
7745
"pull in all the changes made by others. This is done using the \"update\"\n"
7746
"command. The changes need to be applied before any non-local commit, but\n"
7747
"Bazaar will tell you if there are any changes and suggest that you use this\n"
7748
"command when needed."
7751
#: dummy/help_topics/checkouts/detail.txt:32
7753
"It is also possible to create a \"lightweight\" checkout by passing the\n"
7754
"--lightweight flag to checkout. A lightweight checkout is even closer to an\n"
7755
"SVN checkout in that it is not a first class branch, it mainly consists of "
7757
"working tree. This means that any history operations must query the master\n"
7758
"branch, which could be slow if a network connection is involved. Also, as "
7760
"don't have a local branch, then you cannot commit locally."
7763
#: dummy/help_topics/checkouts/detail.txt:39
7765
"Lightweight checkouts work best when you have fast reliable access to the\n"
7766
"master branch. This means that if the master branch is on the same disk or "
7768
"a lightweight checkout will be faster than a heavyweight one for any "
7770
"that modify the revision history (as only one copy of the branch needs to\n"
7771
"be updated). Heavyweight checkouts will generally be faster for any command\n"
7772
"that uses the history but does not change it, but if the master branch is "
7774
"the same disk then there won't be a noticeable difference."
7777
#: dummy/help_topics/checkouts/detail.txt:47
7779
"Another possible use for a checkout is to use it with a treeless repository\n"
7780
"containing your branches, where you maintain only one working tree by\n"
7781
"switching the master branch that the checkout points to when you want to\n"
7782
"work on a different branch."
7785
#: dummy/help_topics/checkouts/detail.txt:52
7787
"Obviously to commit on a checkout you need to be able to write to the "
7789
"branch. This means that the master branch must be accessible over a "
7791
"protocol , such as sftp://, and that you have write permissions at the "
7793
"end. Checkouts also work on the local file system, so that all that matters "
7798
#: dummy/help_topics/checkouts/detail.txt:58
7800
"You can change the master of a checkout by using the \"switch\" command "
7802
"\"help switch\"). This will change the location that the commits are sent "
7804
"The \"bind\" command can also be used to turn a normal branch into a heavy\n"
7805
"checkout. If you would like to convert your heavy checkout into a normal\n"
7806
"branch so that every commit is local, you can use the \"unbind\" command. To "
7808
"whether or not a branch is bound or not you can use the \"info\" command. If "
7810
"branch is bound it will tell you the location of the bound branch."
7813
#: dummy/help_topics/checkouts/detail.txt:68
7815
" checkout Create a checkout. Pass --lightweight to get a lightweight\n"
7817
" update Pull any changes in the master branch in to your checkout\n"
7818
" commit Make a commit that is sent to the master branch. If you have\n"
7819
" a heavy checkout then the --local option will commit to the\n"
7820
" checkout without sending the commit to the master\n"
7821
" switch Change the master branch that the commits in the checkout "
7824
" bind Turn a standalone branch into a heavy checkout so that any\n"
7825
" commits will be sent to the master branch\n"
7826
" unbind Turn a heavy checkout into a standalone branch so that any\n"
7827
" commits are only made locally\n"
7828
" info Displays whether a branch is bound or unbound. If the branch "
7830
" bound, then it will also display the location of the bound "
7834
#: dummy/help_topics/checkouts/summary.txt:1
7835
msgid "Information on what a checkout is"
7838
#: dummy/help_topics/commands/summary.txt:1
7839
msgid "Basic help for all commands"
7842
#: dummy/help_topics/configuration/summary.txt:1
7843
msgid "Details on the configuration settings available"
7846
#: dummy/help_topics/conflict-types/summary.txt:1
7847
msgid "Types of conflicts and what to do about them"
7850
#: dummy/help_topics/content-filters/summary.txt:1
7851
msgid "Conversion of content into/from working trees"
7854
#: dummy/help_topics/criss-cross/detail.txt:1
7858
#: dummy/help_topics/criss-cross/detail.txt:3
7860
"A criss-cross in the branch history can cause the default merge technique\n"
7861
"to emit more conflicts than would normally be expected."
7864
#: dummy/help_topics/criss-cross/detail.txt:6
7866
"In complex merge cases, ``bzr merge --lca`` or ``bzr merge --weave`` may "
7868
"better results. You may wish to ``bzr revert`` the working tree and merge\n"
7869
"again. Alternatively, use ``bzr remerge`` on particular conflicted files."
7872
#: dummy/help_topics/criss-cross/detail.txt:10
7874
"Criss-crosses occur in a branch's history if two branches merge the same "
7876
"and then merge one another, or if two branches merge one another at the "
7878
"time. They can be avoided by having each branch only merge from or into a\n"
7879
"designated central branch (a \"star topology\")."
7882
#: dummy/help_topics/criss-cross/detail.txt:15
7884
"Criss-crosses cause problems because of the way merge works. Bazaar's "
7886
"merge is a three-way merger; in order to merge OTHER into THIS, it must\n"
7887
"find a basis for comparison, BASE. Using BASE, it can determine whether\n"
7888
"differences between THIS and OTHER are due to one side adding lines, or\n"
7889
"from another side removing lines."
7892
#: dummy/help_topics/criss-cross/detail.txt:21
7894
"Criss-crosses mean there is no good choice for a base. Selecting the "
7896
"merge points could cause one side's changes to be silently discarded.\n"
7897
"Selecting older merge points (which Bazaar does) mean that extra conflicts\n"
7901
#: dummy/help_topics/criss-cross/detail.txt:26
7903
"The ``weave`` merge type is not affected by this problem because it uses\n"
7904
"line-origin detection instead of a basis revision to determine the cause of\n"
7908
#: dummy/help_topics/criss-cross/summary.txt:1
7909
msgid "Information on criss-cross merging"
7912
#: dummy/help_topics/current-formats/summary.txt:1
7913
msgid "Current storage formats"
7916
#: dummy/help_topics/debug-flags/summary.txt:1
7917
msgid "Options to show or record debug information"
7920
#: dummy/help_topics/diverged-branches/summary.txt:1
7921
msgid "How to fix diverged branches"
7924
#: dummy/help_topics/env-variables/summary.txt:1
7925
msgid "Environment variable names and values"
7928
#: dummy/help_topics/eol/summary.txt:1
7929
msgid "Information on end-of-line handling"
7932
#: dummy/help_topics/files/detail.txt:1
7936
#: dummy/help_topics/files/detail.txt:3
7938
":On Unix: ~/.bazaar/bazaar.conf\n"
7939
":On Windows: C:\\\\Documents and Settings\\\\username\\\\Application Data\\\\"
7940
"bazaar\\\\2.0\\\\bazaar.conf"
7943
#: dummy/help_topics/files/detail.txt:6
7945
"Contains the user's default configuration. The section ``[DEFAULT]`` is\n"
7946
"used to define general configuration that will be applied everywhere.\n"
7947
"The section ``[ALIASES]`` can be used to create command aliases for\n"
7948
"commonly used options."
7951
#: dummy/help_topics/files/detail.txt:11
7952
msgid "A typical config file might look something like::"
7955
#: dummy/help_topics/files/detail.txt:13
7958
" email=John Doe <jdoe@isp.com>"
7961
#: dummy/help_topics/files/detail.txt:16
7964
" commit = commit --strict\n"
7965
" log10 = log --short -r -10..-1\n"
7968
#: dummy/help_topics/files/summary.txt:1
7969
msgid "Information on configuration and log files"
7972
#: dummy/help_topics/formats/detail.txt:1
7973
msgid "Storage Formats"
7976
#: dummy/help_topics/formats/detail.txt:3
7978
"To ensure that older clients do not access data incorrectly,\n"
7979
"Bazaar's policy is to introduce a new storage format whenever\n"
7980
"new features requiring new metadata are added. New storage\n"
7981
"formats may also be introduced to improve performance and\n"
7985
#: dummy/help_topics/formats/detail.txt:9
7987
"The newest format, 2a, is highly recommended. If your\n"
7988
"project is not using 2a, then you should suggest to the\n"
7989
"project owner to upgrade."
7992
#: dummy/help_topics/formats/detail.txt:13
7998
#: dummy/help_topics/formats/detail.txt:16
8000
" Some of the older formats have two variants:\n"
8001
" a plain one and a rich-root one. The latter include an additional\n"
8002
" field about the root of the tree. There is no performance cost\n"
8003
" for using a rich-root format but you cannot easily merge changes\n"
8004
" from a rich-root format into a plain format. As a consequence,\n"
8005
" moving a project to a rich-root format takes some co-ordination\n"
8006
" in that all contributors need to upgrade their repositories\n"
8007
" around the same time. 2a and all future formats will be\n"
8008
" implicitly rich-root."
8011
#: dummy/help_topics/formats/detail.txt:26
8013
"See :doc:`current-formats-help` for the complete list of\n"
8014
"currently supported formats. See :doc:`other-formats-help` for\n"
8015
"descriptions of any available experimental and deprecated formats.\n"
8018
#: dummy/help_topics/formats/summary.txt:1
8019
msgid "Information on choosing a storage format"
8022
#: dummy/help_topics/global-options/detail.txt:1
8023
msgid "Global Options"
8026
#: dummy/help_topics/global-options/detail.txt:3
8028
"These options may be used with any command, and may appear in front of any\n"
8029
"command. (e.g. ``bzr --profile help``)."
8032
#: dummy/help_topics/global-options/detail.txt:6
8034
"--version Print the version number. Must be supplied before the "
8036
"--no-aliases Do not process command aliases when running this command.\n"
8037
"--builtin Use the built-in version of a command, not the plugin "
8039
" This does not suppress other plugin effects.\n"
8040
"--no-plugins Do not process any plugins.\n"
8041
"--no-l10n Do not translate messages.\n"
8042
"--concurrency Number of processes that can be run concurrently (selftest)."
8045
#: dummy/help_topics/global-options/detail.txt:14
8047
"--profile Profile execution using the hotshot profiler.\n"
8048
"--lsprof Profile execution using the lsprof profiler.\n"
8049
"--lsprof-file Profile execution using the lsprof profiler, and write the\n"
8050
" results to a specified file. If the filename ends with "
8052
" text format will be used. If the filename either starts "
8054
" \"callgrind.out\" or end with \".callgrind\", the output will "
8056
" formatted for use with KCacheGrind. Otherwise, the output\n"
8057
" will be a pickle.\n"
8058
"--coverage Generate line coverage report in the specified directory."
8061
#: dummy/help_topics/global-options/detail.txt:24
8063
"-Oname=value Override the ``name`` config option setting it to ``value`` "
8065
" the duration of the command. This can be used multiple times "
8067
" several options need to be overridden."
8070
#: dummy/help_topics/global-options/detail.txt:28
8072
"See http://doc.bazaar.canonical.com/developers/profiling.html for more\n"
8073
"information on profiling."
8076
#: dummy/help_topics/global-options/detail.txt:31
8078
"A number of debug flags are also available to assist troubleshooting and\n"
8079
"development. See :doc:`debug-flags-help`.\n"
8082
#: dummy/help_topics/global-options/summary.txt:1
8083
msgid "Options that control how Bazaar runs"
8086
#: dummy/help_topics/hidden-commands/summary.txt:1
8087
msgid "All hidden commands"
8090
#: dummy/help_topics/hooks/summary.txt:1
8091
msgid "Points at which custom processing can be added"
8094
#: dummy/help_topics/launchpad/detail.txt:1
8095
msgid "Integration with Launchpad.net"
8098
#: dummy/help_topics/launchpad/detail.txt:3
8100
"Launchpad.net provides free Bazaar branch hosting with integrated bug and\n"
8101
"specification tracking."
8104
#: dummy/help_topics/launchpad/detail.txt:6
8106
"The bzr client (through the plugin called 'launchpad') has special\n"
8107
"features to communicate with Launchpad:"
8110
#: dummy/help_topics/launchpad/detail.txt:9
8112
" * The launchpad-login command tells Bazaar your Launchpad user name. "
8114
" is then used by the 'lp:' transport to download your branches using\n"
8118
#: dummy/help_topics/launchpad/detail.txt:13
8120
" * The 'lp:' transport uses Launchpad as a directory service: for "
8122
" 'lp:bzr' and 'lp:python' refer to the main branches of the relevant\n"
8123
" projects and may be branched, logged, etc. You can also use the 'lp:'\n"
8124
" transport to refer to specific branches, e.g. lp:~bzr/bzr/trunk."
8127
#: dummy/help_topics/launchpad/detail.txt:18
8129
" * The 'lp:' bug tracker alias can expand launchpad bug numbers to their\n"
8130
" URLs for use with 'bzr commit --fixes', e.g. 'bzr commit --fixes "
8132
" will record a revision property that marks that revision as fixing\n"
8133
" Launchpad bug 12345. When you push that branch to Launchpad it will\n"
8134
" automatically be linked to the bug report."
8137
#: dummy/help_topics/launchpad/detail.txt:24
8139
" * The register-branch command tells Launchpad about the url of a\n"
8140
" public branch. Launchpad will then mirror the branch, display\n"
8141
" its contents and allow it to be attached to bugs and other\n"
8145
#: dummy/help_topics/launchpad/detail.txt:29
8146
msgid "For more information see http://help.launchpad.net/\n"
8149
#: dummy/help_topics/launchpad/summary.txt:1
8150
msgid "Using Bazaar with Launchpad.net"
8153
#: dummy/help_topics/location-alias/summary.txt:1
8154
msgid "Aliases for remembered locations"
8157
#: dummy/help_topics/log-formats/summary.txt:1
8158
msgid "Details on the logging formats available"
8161
#: dummy/help_topics/other-formats/summary.txt:1
8162
msgid "Experimental and deprecated storage formats"
8165
#: dummy/help_topics/patterns/summary.txt:1
8166
msgid "Information on the pattern syntax"
8169
#: dummy/help_topics/repositories/detail.txt:1
8170
msgid "Repositories"
8173
#: dummy/help_topics/repositories/detail.txt:3
8175
"Repositories in Bazaar are where committed information is stored. There is\n"
8176
"a repository associated with every branch."
8179
#: dummy/help_topics/repositories/detail.txt:6
8181
"Repositories are a form of database. Bzr will usually maintain this for\n"
8182
"good performance automatically, but in some situations (e.g. when doing\n"
8183
"very many commits in a short time period) you may want to ask bzr to\n"
8184
"optimise the database indices. This can be done by the 'bzr pack' command."
8187
#: dummy/help_topics/repositories/detail.txt:11
8189
"By default just running 'bzr init' will create a repository within the new\n"
8190
"branch but it is possible to create a shared repository which allows "
8192
"branches to share their information in the same location. When a new branch "
8194
"created it will first look to see if there is a containing shared repository "
8199
#: dummy/help_topics/repositories/detail.txt:17
8201
"When two branches of the same project share a repository, there is\n"
8202
"generally a large space saving. For some operations (e.g. branching\n"
8203
"within the repository) this translates in to a large time saving."
8206
#: dummy/help_topics/repositories/detail.txt:21
8208
"To create a shared repository use the init-repository command (or the alias\n"
8209
"init-repo). This command takes the location of the repository to create. "
8211
"means that 'bzr init-repository repo' will create a directory named 'repo',\n"
8212
"which contains a shared repository. Any new branches that are created in "
8214
"directory will then use it for storage."
8217
#: dummy/help_topics/repositories/detail.txt:27
8219
"It is a good idea to create a repository whenever you might create more\n"
8220
"than one branch of a project. This is true for both working areas where you\n"
8221
"are doing the development, and any server areas that you use for hosting\n"
8222
"projects. In the latter case, it is common to want branches without working\n"
8223
"trees. Since the files in the branch will not be edited directly there is "
8225
"need to use up disk space for a working tree. To create a repository in "
8227
"the branches will not have working trees pass the '--no-trees' option to\n"
8228
"'init-repository'."
8231
#: dummy/help_topics/repositories/detail.txt:38
8233
" init-repository Create a shared repository. Use --no-trees to create "
8235
" in which new branches won't get a working tree.\n"
8238
#: dummy/help_topics/repositories/summary.txt:1
8239
msgid "Basic information on shared repositories."
8242
#: dummy/help_topics/revisionspec/summary.txt:1
8243
msgid "Explain how to use --revision"
8246
#: dummy/help_topics/rules/summary.txt:1
8247
msgid "Information on defining rule-based preferences"
8250
#: dummy/help_topics/standalone-trees/detail.txt:1
8251
msgid "Standalone Trees"
8254
#: dummy/help_topics/standalone-trees/detail.txt:3
8256
"A standalone tree is a working tree with an associated repository. It\n"
8257
"is an independently usable branch, with no dependencies on any other.\n"
8258
"Creating a standalone tree (via bzr init) is the quickest way to put\n"
8259
"an existing project under version control."
8262
#: dummy/help_topics/standalone-trees/detail.txt:8
8263
msgid "Related Commands::"
8266
#: dummy/help_topics/standalone-trees/detail.txt:10
8267
msgid " init Make a directory into a versioned branch.\n"
8270
#: dummy/help_topics/standalone-trees/summary.txt:1
8271
msgid "Information on what a standalone tree is"
8274
#: dummy/help_topics/standard-options/detail.txt:1
8275
msgid "Standard Options"
8278
#: dummy/help_topics/standard-options/detail.txt:3
8279
msgid "Standard options are legal for all commands."
8282
#: dummy/help_topics/standard-options/detail.txt:5
8284
"--help, -h Show help message.\n"
8285
"--verbose, -v Display more information.\n"
8286
"--quiet, -q Only display errors and warnings."
8289
#: dummy/help_topics/standard-options/detail.txt:9
8290
msgid "Unlike global options, standard options can be used in aliases.\n"
8293
#: dummy/help_topics/standard-options/summary.txt:1
8294
msgid "Options that can be used with any command"
8297
#: dummy/help_topics/status-flags/detail.txt:1
8298
msgid "Status Flags"
8301
#: dummy/help_topics/status-flags/detail.txt:3
8303
"Status flags are used to summarise changes to the working tree in a concise\n"
8304
"manner. They are in the form::"
8307
#: dummy/help_topics/status-flags/detail.txt:6
8308
msgid " xxx <filename>"
8311
#: dummy/help_topics/status-flags/detail.txt:8
8312
msgid "where the columns' meanings are as follows."
8315
#: dummy/help_topics/status-flags/detail.txt:10
8316
msgid "Column 1 - versioning/renames::"
8319
#: dummy/help_topics/status-flags/detail.txt:12
8321
" + File versioned\n"
8322
" - File unversioned\n"
8325
" X File nonexistent (and unknown to bzr)\n"
8326
" C File has conflicts\n"
8327
" P Entry for a pending merge (not a file)"
8330
#: dummy/help_topics/status-flags/detail.txt:20
8331
msgid "Column 2 - contents::"
8334
#: dummy/help_topics/status-flags/detail.txt:22
8338
" K File kind changed\n"
8342
#: dummy/help_topics/status-flags/detail.txt:27
8343
msgid "Column 3 - execute::"
8346
#: dummy/help_topics/status-flags/detail.txt:29
8347
msgid " * The execute bit was changed\n"
8350
#: dummy/help_topics/status-flags/summary.txt:1
8351
msgid "Help on status flags"
8354
#: dummy/help_topics/sync-for-reconfigure/detail.txt:1
8355
msgid "Branches Out of Sync"
8358
#: dummy/help_topics/sync-for-reconfigure/detail.txt:3
8360
"When reconfiguring a checkout, tree or branch into a lightweight checkout,\n"
8361
"a local branch must be destroyed. (For checkouts, this is the local branch\n"
8362
"that serves primarily as a cache.) If the branch-to-be-destroyed does not\n"
8363
"have the same last revision as the new reference branch for the lightweight\n"
8364
"checkout, data could be lost, so Bazaar refuses."
8367
#: dummy/help_topics/sync-for-reconfigure/detail.txt:9
8368
msgid "How you deal with this depends on *why* the branches are out of sync."
8371
#: dummy/help_topics/sync-for-reconfigure/detail.txt:11
8373
"If you have a checkout and have done local commits, you can get back in "
8375
"by running \"bzr update\" (and possibly \"bzr commit\")."
8378
#: dummy/help_topics/sync-for-reconfigure/detail.txt:14
8380
"If you have a branch and the remote branch is out-of-date, you can push\n"
8381
"the local changes using \"bzr push\". If the local branch is out of date, "
8383
"can do \"bzr pull\". If both branches have had changes, you can merge, "
8385
"and then push your changes. If you decide that some of the changes aren't\n"
8386
"useful, you can \"push --overwrite\" or \"pull --overwrite\" instead.\n"
8389
#: dummy/help_topics/sync-for-reconfigure/summary.txt:1
8390
msgid "Steps to resolve \"out-of-sync\" when reconfiguring"
8393
#: dummy/help_topics/topics/summary.txt:1
8397
#: dummy/help_topics/url-special-chars/summary.txt:1
8398
msgid "Special character handling in URLs"
8401
#: dummy/help_topics/urlspec/summary.txt:1
8402
msgid "Supported transport protocols"
8405
#: dummy/help_topics/working-trees/detail.txt:1
8406
msgid "Working Trees"
8409
#: dummy/help_topics/working-trees/detail.txt:3
8411
"A working tree is the contents of a branch placed on disk so that you can\n"
8412
"see the files and edit them. The working tree is where you make changes to "
8414
"branch, and when you commit the current state of the working tree is the\n"
8415
"snapshot that is recorded in the commit."
8418
#: dummy/help_topics/working-trees/detail.txt:8
8420
"When you push a branch to a remote system, a working tree will not be\n"
8421
"created. If one is already present the files will not be updated. The\n"
8422
"branch information will be updated and the working tree will be marked\n"
8423
"as out-of-date. Updating a working tree remotely is difficult, as there\n"
8424
"may be uncommitted changes or the update may cause content conflicts that "
8426
"difficult to deal with remotely."
8429
#: dummy/help_topics/working-trees/detail.txt:15
8431
"If you have a branch with no working tree you can use the 'checkout' "
8433
"to create a working tree. If you run 'bzr checkout .' from the branch it "
8435
"create the working tree. If the branch is updated remotely, you can update "
8437
"working tree by running 'bzr update' in that directory."
8440
#: dummy/help_topics/working-trees/detail.txt:20
8442
"If you have a branch with a working tree that you do not want the 'remove-"
8444
"command will remove the tree if it is safe. This can be done to avoid the\n"
8445
"warning about the remote working tree not being updated when pushing to the\n"
8446
"branch. It can also be useful when working with a '--no-trees' repository\n"
8447
"(see 'bzr help repositories')."
8450
#: dummy/help_topics/working-trees/detail.txt:26
8452
"If you want to have a working tree on a remote machine that you push to you\n"
8453
"can either run 'bzr update' in the remote branch after each push, or use "
8455
"other method to update the tree during the push. There is an 'rspush' "
8457
"that will update the working tree using rsync as well as doing a push. "
8459
"is also a 'push-and-update' plugin that automates running 'bzr update' via "
8464
#: dummy/help_topics/working-trees/detail.txt:33
8465
msgid "Useful commands::"
8468
#: dummy/help_topics/working-trees/detail.txt:35
8470
" checkout Create a working tree when a branch does not have one.\n"
8471
" remove-tree Removes the working tree from a branch when it is safe to do "
8473
" update When a working tree is out of sync with its associated "
8475
" this will update the tree to match the branch.\n"
8478
#: dummy/help_topics/working-trees/summary.txt:1
8479
msgid "Information on working trees"
8482
#: en/help_topics/authentication.txt:1
8484
"Authentication Settings\n"
8485
"======================="
8488
#: en/help_topics/authentication.txt:4
8495
#: en/help_topics/authentication.txt:8
8497
"Many different authentication policies can be described in the\n"
8498
"``authentication.conf`` file but a particular user should need only a few\n"
8499
"definitions to cover his needs without having to specify a user and a "
8501
"for every branch he uses."
8504
#: en/help_topics/authentication.txt:13
8506
"The definitions found in this file are used to find the credentials to use "
8508
"a given url. The same credentials can generally be used for as many branches "
8510
"possible by grouping their declaration around the remote servers that need\n"
8511
"them. It's even possible to declare credentials that will be used by "
8516
#: en/help_topics/authentication.txt:19
8518
"The intent is to make this file as small as possible to minimize maintenance."
8521
#: en/help_topics/authentication.txt:21
8523
"Once the relevant credentials are declared in this file you may use branch "
8525
"without embedding passwords (security hazard) or even users (enabling "
8527
"of your urls with others)."
8530
#: en/help_topics/authentication.txt:25
8531
msgid "Instead of using::"
8534
#: en/help_topics/authentication.txt:27
8535
msgid " bzr branch ftp://joe:secret@host.com/path/to/my/branch"
8538
#: en/help_topics/authentication.txt:29
8539
msgid "you simply use::"
8542
#: en/help_topics/authentication.txt:31
8543
msgid " bzr branch ftp://host.com/path/to/my/branch"
8546
#: en/help_topics/authentication.txt:33
8548
"provided you have created the following ``authentication.conf`` file::"
8551
#: en/help_topics/authentication.txt:35
8557
" password=secret\n"
8561
#: en/help_topics/authentication.txt:42
8563
"Authentication definitions\n"
8564
"--------------------------"
8567
#: en/help_topics/authentication.txt:45
8569
"There are two kinds of authentication used by the various schemes supported "
8574
#: en/help_topics/authentication.txt:48
8575
msgid "1. user and password"
8578
#: en/help_topics/authentication.txt:50
8580
"``FTP`` needs a (``user``, ``password``) to authenticate against a ``host``\n"
8581
"``SFTP`` can use either a password or a host key to authenticate. However,\n"
8582
"ssh agents are a better, more secure solution. So we have chosen to not "
8584
"our own less secure method."
8587
#: en/help_topics/authentication.txt:55
8588
msgid "2. user, realm and password"
8591
#: en/help_topics/authentication.txt:57
8593
"``HTTP`` and ``HTTPS`` needs a (``user, realm, password``) to authenticate\n"
8594
"against a host. But, by using ``.htaccess`` files, for example, it is "
8596
"to define several (``user, realm, password``) for a given ``host``. So what "
8598
"really needed is (``user``, ``password``, ``host``, ``path``). The ``realm`` "
8600
"not taken into account in the definitions, but will displayed if bzr "
8602
"you for a password."
8605
#: en/help_topics/authentication.txt:64
8607
"``HTTP proxy`` can be handled as ``HTTP`` (or ``HTTPS``) by explicitly\n"
8608
"specifying the appropriate port."
8611
#: en/help_topics/authentication.txt:67
8613
"To take all schemes into account, the password will be deduced from a set "
8615
"authentication definitions (``scheme``, ``host``, ``port``, ``path``, "
8620
#: en/help_topics/authentication.txt:71
8622
" * ``scheme``: can be empty (meaning the rest of the definition can be "
8624
" for any scheme), ``SFTP`` and ``bzr+ssh`` should not be used here, "
8626
" should be used instead since this is the real scheme regarding\n"
8630
#: en/help_topics/authentication.txt:76
8631
msgid " * ``host``: can be empty (to act as a default for any host),"
8634
#: en/help_topics/authentication.txt:78
8636
" * ``port`` can be empty (useful when an host provides several servers for "
8638
" same scheme), only numerical values are allowed, this should be used "
8640
" when the server uses a port different than the scheme standard port,"
8643
#: en/help_topics/authentication.txt:82
8644
msgid " * ``path``: can be empty (FTP or SFTP will never user it),"
8647
#: en/help_topics/authentication.txt:84
8649
" * ``user``: can be empty (``bzr`` will defaults to python's\n"
8650
" ``getpass.get_user()``),"
8653
#: en/help_topics/authentication.txt:87
8655
" * ``password``: can be empty if you prefer to always be prompted for your\n"
8659
#: en/help_topics/authentication.txt:90
8661
"Multiple definitions can be provided and, for a given URL, bzr will select "
8663
"(``user`` [, ``password``]) based on the following rules :"
8666
#: en/help_topics/authentication.txt:93
8667
msgid " 1. the first match wins,"
8670
#: en/help_topics/authentication.txt:95
8671
msgid " 2. empty fields match everything,"
8674
#: en/help_topics/authentication.txt:97
8676
" 3. ``scheme`` matches even if decorators are used in the requested URL,"
8679
#: en/help_topics/authentication.txt:99
8681
" 4. ``host`` matches exactly or act as a domain if it starts with '.'\n"
8682
" (``project.bzr.sf.net`` will match ``.bzr.sf.net`` but "
8683
"``projectbzr.sf.net``\n"
8684
" will not match ``bzr.sf.net``)."
8687
#: en/help_topics/authentication.txt:103
8689
" 5. ``port`` matches if included in the requested URL (exact matches only)"
8692
#: en/help_topics/authentication.txt:105
8694
" 6. ``path`` matches if included in the requested URL (and by rule #2 "
8696
" empty paths will match any provided path)."
8699
#: en/help_topics/authentication.txt:110
8705
#: en/help_topics/authentication.txt:113
8707
"The general rules for :doc:`configuration files <configuration-help>`\n"
8708
"apply except for the variable policies."
8711
#: en/help_topics/authentication.txt:116
8712
msgid "Each section describes an authentication definition."
8715
#: en/help_topics/authentication.txt:118
8717
"The section name is an arbitrary string, only the ``DEFAULT`` value is "
8719
"and should appear as the *last* section."
8722
#: en/help_topics/authentication.txt:121
8723
msgid "Each section should define:"
8726
#: en/help_topics/authentication.txt:123
8727
msgid "* ``user``: the login to be used,"
8730
#: en/help_topics/authentication.txt:125
8731
msgid "Each section could define:"
8734
#: en/help_topics/authentication.txt:127
8735
msgid "* ``host``: the remote server,"
8738
#: en/help_topics/authentication.txt:129
8739
msgid "* ``port``: the port the server is listening,"
8742
#: en/help_topics/authentication.txt:131
8743
msgid "* ``path``: the branch location,"
8746
#: en/help_topics/authentication.txt:133
8747
msgid "* ``password``: the password."
8750
#: en/help_topics/authentication.txt:135
8757
#: en/help_topics/authentication.txt:139
8760
"Personal projects hosted outside\n"
8761
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
8764
#: en/help_topics/authentication.txt:143
8766
"All connections are done with the same ``user`` (the remote one for which "
8768
"default bzr one is not appropriate) and the password is always prompted "
8773
#: en/help_topics/authentication.txt:147
8775
" # Pet projects on hobby.net\n"
8777
" host=r.hobby.net\n"
8779
" password=obvious1234\n"
8786
" password=1essobV10us\n"
8789
" # Our local user is barbaz, on all remote sites we're known as "
8794
#: en/help_topics/authentication.txt:164
8797
"Source hosting provider\n"
8798
"~~~~~~~~~~~~~~~~~~~~~~~"
8801
#: en/help_topics/authentication.txt:168
8802
msgid "In the shp.net (fictitious) domain, each project has its own site::"
8805
#: en/help_topics/authentication.txt:170
8807
" [shpnet domain]\n"
8808
" # we use sftp, but ssh is the scheme used for authentication\n"
8810
" # The leading '.' ensures that 'shp.net' alone doesn't match\n"
8813
" # bzr don't support supplying a password for sftp,\n"
8814
" # consider using an ssh agent if you don't want to supply\n"
8815
" # a password interactively. (pageant, ssh-agent, etc)"
8818
#: en/help_topics/authentication.txt:180
8820
"HTTPS, SFTP servers and their proxy\n"
8821
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
8824
#: en/help_topics/authentication.txt:183
8826
"At company.com, the server hosting release and integration branches is "
8828
"proxy, and the two branches use different authentication policies::"
8831
#: en/help_topics/authentication.txt:186
8833
" [reference code]\n"
8835
" host=dev.company.com\n"
8841
#: en/help_topics/authentication.txt:193
8843
" # development branches on dev server\n"
8845
" scheme=ssh # bzr+ssh and sftp are available here\n"
8846
" host=dev.company.com\n"
8847
" path=/dev/integration\n"
8853
" host=proxy.company.com\n"
8855
" user=proxyuser1\n"
8856
" password=proxypass1"
8859
#: en/help_topics/authentication.txt:208
8862
"Planned enhancements\n"
8863
"--------------------"
8866
#: en/help_topics/authentication.txt:212
8868
"The following are not yet implemented but planned as parts of a work in\n"
8872
#: en/help_topics/authentication.txt:215
8873
msgid "* add a ``password_encoding`` field allowing:"
8876
#: en/help_topics/authentication.txt:217
8878
" - storing the passwords in various obfuscating encodings (base64 for one),"
8881
#: en/help_topics/authentication.txt:219
8882
msgid " - delegate password storage to plugins (.netrc for example)."
8885
#: en/help_topics/authentication.txt:221
8887
"* update the credentials when the user is prompted for user or password,"
8890
#: en/help_topics/authentication.txt:223
8891
msgid "* add a ``verify_certificates`` field for ``HTTPS``."
8894
#: en/help_topics/authentication.txt:225
8896
"The ``password_encoding`` and ``verify_certificates`` fields are recognized "
8898
"ignored in the actual implementation.\n"
8901
#: en/help_topics/bugs.txt:1
8902
msgid "Bug Tracker Settings"
8905
#: en/help_topics/bugs.txt:3
8907
"When making a commit, metadata about bugs fixed by that change can be\n"
8908
"recorded by using the ``--fixes`` option. For each bug marked as fixed, an\n"
8909
"entry is included in the 'bugs' revision property stating '<url> <status>'.\n"
8910
"(The only ``status`` value currently supported is ``fixed.``)"
8913
#: en/help_topics/bugs.txt:8
8915
"The ``--fixes`` option allows you to specify a bug tracker and a bug "
8917
"rather than a full URL. This looks like::"
8920
#: en/help_topics/bugs.txt:11
8921
msgid " bzr commit --fixes <tracker>:<id>"
8924
#: en/help_topics/bugs.txt:13 en/help_topics/configuration.txt:410
8928
#: en/help_topics/bugs.txt:15
8929
msgid " bzr commit --fixes <id>"
8932
#: en/help_topics/bugs.txt:17
8934
"where \"<tracker>\" is an identifier for the bug tracker, and \"<id>\" is "
8936
"identifier for that bug within the bugtracker, usually the bug number.\n"
8937
"If \"<tracker>\" is not specified the ``bugtracker`` set in the branch\n"
8938
"or global configuration is used."
8941
#: en/help_topics/bugs.txt:22
8943
"Bazaar knows about a few bug trackers that have many users. If\n"
8944
"you use one of these bug trackers then there is no setup required to\n"
8945
"use this feature, you just need to know the tracker identifier to use.\n"
8946
"These are the bugtrackers that are built in:"
8949
#: en/help_topics/bugs.txt:27
8951
" ============================ ============ ============\n"
8952
" URL Abbreviation Example\n"
8953
" ============================ ============ ============\n"
8954
" https://bugs.launchpad.net/ lp lp:12345\n"
8955
" http://bugs.debian.org/ deb deb:12345\n"
8956
" http://bugzilla.gnome.org/ gnome gnome:12345\n"
8957
" ============================ ============ ============"
8960
#: en/help_topics/bugs.txt:35
8962
"For the bug trackers not listed above configuration is required.\n"
8963
"Support for generating the URLs for any project using Bugzilla or Trac\n"
8964
"is built in, along with a template mechanism for other bugtrackers with\n"
8965
"simple URL schemes. If your bug tracker can't be described by one\n"
8966
"of the schemes described below then you can write a plugin to support\n"
8970
#: en/help_topics/bugs.txt:42
8972
"If you use Bugzilla or Trac, then you only need to set a configuration\n"
8973
"variable which contains the base URL of the bug tracker. These options\n"
8974
"can go into ``bazaar.conf``, ``branch.conf`` or into a branch-specific\n"
8975
"configuration section in ``locations.conf``. You can set up these values\n"
8976
"for each of the projects you work on."
8979
#: en/help_topics/bugs.txt:48
8981
"Note: As you provide a short name for each tracker, you can specify one or\n"
8982
"more bugs in one or more trackers at commit time if you wish."
8985
#: en/help_topics/bugs.txt:51
8991
#: en/help_topics/bugs.txt:54
8993
"Use ``bzr commit --fixes lp:2`` to record that this commit fixes bug 2."
8996
#: en/help_topics/bugs.txt:56
8998
"bugzilla_<tracker>_url\n"
8999
"----------------------"
9002
#: en/help_topics/bugs.txt:59
9004
"If present, the location of the Bugzilla bug tracker referred to by\n"
9005
"<tracker>. This option can then be used together with ``bzr commit\n"
9006
"--fixes`` to mark bugs in that tracker as being fixed by that commit. For\n"
9010
#: en/help_topics/bugs.txt:64
9011
msgid " bugzilla_squid_url = http://bugs.squid-cache.org"
9014
#: en/help_topics/bugs.txt:66
9016
"would allow ``bzr commit --fixes squid:1234`` to mark Squid's bug 1234 as\n"
9020
#: en/help_topics/bugs.txt:69
9022
"trac_<tracker>_url\n"
9023
"------------------"
9026
#: en/help_topics/bugs.txt:72
9028
"If present, the location of the Trac instance referred to by\n"
9029
"<tracker>. This option can then be used together with ``bzr commit\n"
9030
"--fixes`` to mark bugs in that tracker as being fixed by that commit. For\n"
9034
#: en/help_topics/bugs.txt:77
9035
msgid " trac_twisted_url = http://www.twistedmatrix.com/trac"
9038
#: en/help_topics/bugs.txt:79
9040
"would allow ``bzr commit --fixes twisted:1234`` to mark Twisted's bug 1234 "
9045
#: en/help_topics/bugs.txt:82
9047
"bugtracker_<tracker>_url\n"
9048
"------------------------"
9051
#: en/help_topics/bugs.txt:85
9053
"If present, the location of a generic bug tracker instance referred to by\n"
9054
"<tracker>. The location must contain an ``{id}`` placeholder,\n"
9055
"which will be replaced by a specific bug ID. This option can then be used\n"
9056
"together with ``bzr commit --fixes`` to mark bugs in that tracker as being\n"
9057
"fixed by that commit. For example::"
9060
#: en/help_topics/bugs.txt:91
9061
msgid " bugtracker_python_url = http://bugs.python.org/issue{id}"
9064
#: en/help_topics/bugs.txt:93
9066
"would allow ``bzr commit --fixes python:1234`` to mark bug 1234 in Python's\n"
9067
"Roundup bug tracker as fixed, or::"
9070
#: en/help_topics/bugs.txt:96
9072
" bugtracker_cpan_url = http://rt.cpan.org/Public/Bug/Display.html?id={id}"
9075
#: en/help_topics/bugs.txt:98
9077
"would allow ``bzr commit --fixes cpan:1234`` to mark bug 1234 in CPAN's\n"
9078
"RT bug tracker as fixed, or::"
9081
#: en/help_topics/bugs.txt:101
9082
msgid " bugtracker_hudson_url = http://issues.hudson-ci.org/browse/{id}"
9085
#: en/help_topics/bugs.txt:103
9087
"would allow ``bzr commit --fixes hudson:HUDSON-1234`` to mark bug HUDSON-"
9089
"in Hudson's JIRA bug tracker as fixed.\n"
9092
#: en/help_topics/commands.txt:1
9094
"add Add specified files or directories.\n"
9095
"alias Set/unset and display aliases.\n"
9096
"annotate Show the origin of each line in a file.\n"
9097
"bash-completion Generate a shell function for bash command line "
9099
" [bash_completion]\n"
9100
"bind Convert the current branch into a checkout of the "
9103
"branch Create a new branch that is a copy of an existing branch.\n"
9104
"branches List the branches available at the current location.\n"
9105
"break-lock Break a dead lock.\n"
9106
"cat Write the contents of a file as of a given revision to\n"
9107
" standard output.\n"
9108
"check Validate working tree structure, branch consistency and\n"
9109
" repository history.\n"
9110
"checkout Create a new checkout of an existing branch.\n"
9111
"clean-tree Remove unwanted files from working tree.\n"
9112
"commit Commit changes into a new revision.\n"
9113
"config Display, set or remove a configuration option.\n"
9114
"conflicts List files with conflicts.\n"
9115
"deleted List files deleted in the working tree.\n"
9116
"diff Show differences in the working tree, between revisions "
9119
"dpush Push into a different VCS without any custom bzr "
9121
"export Export current or past revision to a destination directory "
9124
"grep Print lines matching PATTERN for specified files and\n"
9125
" revisions. [grep]\n"
9126
"help Show help on a command or other topic.\n"
9127
"ignore Ignore specified files or patterns.\n"
9128
"ignored List ignored files and the patterns that matched them.\n"
9129
"info Show information about a working tree, branch or "
9131
"init Make a directory into a versioned branch.\n"
9132
"init-repository Create a shared repository for branches to share storage\n"
9134
"join Combine a tree into its containing tree.\n"
9135
"launchpad-login Show or set the Launchpad user ID. [launchpad]\n"
9136
"launchpad-mirror Ask Launchpad to mirror a branch now. [launchpad]\n"
9137
"launchpad-open Open a Launchpad branch page in your web browser. "
9139
"log Show historical log for a branch or subset of a branch.\n"
9140
"lp-find-proposal Find the proposal to merge this revision. [launchpad]\n"
9141
"lp-propose-merge Propose merging a branch on Launchpad. [launchpad]\n"
9142
"ls List files in a tree.\n"
9143
"merge Perform a three-way merge.\n"
9144
"missing Show unmerged/unpulled revisions between two branches.\n"
9145
"mkdir Create a new versioned directory.\n"
9146
"mv Move or rename a file.\n"
9147
"nick Print or set the branch nickname.\n"
9148
"pack Compress the data within a repository.\n"
9149
"ping Pings a Bazaar smart server.\n"
9150
"plugins List the installed plugins.\n"
9151
"pull Turn this branch into a mirror of another branch.\n"
9152
"push Update a mirror of this branch.\n"
9153
"reconcile Reconcile bzr metadata in a branch.\n"
9154
"reconfigure Reconfigure the type of a bzr directory.\n"
9155
"register-branch Register a branch with launchpad.net. [launchpad]\n"
9156
"remerge Redo a merge.\n"
9157
"remove Remove files or directories.\n"
9158
"remove-branch Remove a branch.\n"
9159
"remove-tree Remove the working tree from a given branch/checkout.\n"
9160
"renames Show list of renamed files.\n"
9161
"resolve Mark a conflict as resolved.\n"
9162
"revert Set files in the working tree back to the contents of a\n"
9163
" previous revision.\n"
9164
"revno Show current revision number.\n"
9165
"root Show the tree root directory.\n"
9166
"send Mail or create a merge-directive for submitting changes.\n"
9167
"serve Run the bzr server.\n"
9168
"shelve Temporarily set aside some changes from the current tree.\n"
9169
"sign-my-commits Sign all commits by a given committer.\n"
9170
"split Split a subdirectory of a tree into a separate tree.\n"
9171
"status Display status summary.\n"
9172
"switch Set the branch of a checkout and update.\n"
9173
"tag Create, remove or modify a tag naming a revision.\n"
9175
"testament Show testament (signing-form) of a revision.\n"
9176
"unbind Convert the current checkout into a regular branch.\n"
9177
"uncommit Remove the last committed revision.\n"
9178
"unshelve Restore shelved changes.\n"
9179
"update Update a working tree to a new revision.\n"
9180
"upgrade Upgrade a repository, branch or working tree to a newer\n"
9182
"verify-signatures Verify all commit signatures.\n"
9183
"version Show version of bzr.\n"
9184
"version-info Show version information about this tree.\n"
9185
"view Manage filtered views.\n"
9186
"whoami Show or set bzr user id.\n"
9189
#: en/help_topics/configuration.txt:1
9191
"Configuration Settings\n"
9192
"======================="
9195
#: en/help_topics/configuration.txt:4
9197
"Environment settings\n"
9198
"---------------------"
9201
#: en/help_topics/configuration.txt:7
9203
"While most configuration is handled by configuration files, some options\n"
9204
"which may be semi-permanent can also be controlled through the environment."
9207
#: en/help_topics/configuration.txt:10
9213
#: en/help_topics/configuration.txt:13
9214
msgid "Override the email id used by Bazaar. Typical format::"
9217
#: en/help_topics/configuration.txt:15
9218
msgid " \"John Doe <jdoe@example.com>\""
9221
#: en/help_topics/configuration.txt:17
9222
msgid "See also the ``email`` configuration option."
9225
#: en/help_topics/configuration.txt:19
9227
"BZR_PROGRESS_BAR\n"
9231
#: en/help_topics/configuration.txt:22
9233
"Override the progress display. Possible values are \"none\" or \"text\". "
9235
"the value is \"none\" then no progress bar is displayed. The value \"text\" "
9237
"the ordinary command line progress bar."
9240
#: en/help_topics/configuration.txt:26
9246
#: en/help_topics/configuration.txt:29
9248
"Control whether SIGQUIT behaves normally or invokes a breakin debugger."
9251
#: en/help_topics/configuration.txt:31
9253
"* 0 = Standard SIGQUIT behavior (normally, exit with a core dump)\n"
9254
"* 1 = Invoke breakin debugger (default)"
9257
#: en/help_topics/configuration.txt:34
9263
#: en/help_topics/configuration.txt:37
9264
msgid "Override the home directory used by Bazaar."
9267
#: en/help_topics/configuration.txt:39
9273
#: en/help_topics/configuration.txt:42
9274
msgid "Select a different SSH implementation."
9277
#: en/help_topics/configuration.txt:44
9283
#: en/help_topics/configuration.txt:47
9284
msgid "Control whether to launch a debugger on error."
9287
#: en/help_topics/configuration.txt:49
9289
"* 0 = Standard behavior\n"
9290
"* 1 = Launch debugger"
9293
#: en/help_topics/configuration.txt:52
9299
#: en/help_topics/configuration.txt:55
9300
msgid "Path to the Bazaar executable to use when using the bzr+ssh protocol."
9303
#: en/help_topics/configuration.txt:57
9304
msgid "See also the ``bzr_remote_path`` configuration option."
9307
#: en/help_topics/configuration.txt:59
9313
#: en/help_topics/configuration.txt:62
9314
msgid "Path to the editor Bazaar should use for commit messages, etc."
9317
#: en/help_topics/configuration.txt:64
9323
#: en/help_topics/configuration.txt:67
9325
"Location of the Bazaar log file. You can check the current location by\n"
9326
"running ``bzr version``."
9329
#: en/help_topics/configuration.txt:70
9331
"The log file contains debug information that is useful for diagnosing or\n"
9332
"reporting problems with Bazaar."
9335
#: en/help_topics/configuration.txt:73
9337
"Setting this to ``NUL`` on Windows or ``/dev/null`` on other platforms\n"
9338
"will disable logging."
9341
#: en/help_topics/configuration.txt:76
9348
#: en/help_topics/configuration.txt:80
9350
"The path to the plugins directory that Bazaar should use.\n"
9351
"If not set, Bazaar will search for plugins in:"
9354
#: en/help_topics/configuration.txt:83
9356
"* the user specific plugin directory (containing the ``user`` plugins),"
9359
#: en/help_topics/configuration.txt:85
9360
msgid "* the bzrlib directory (containing the ``core`` plugins),"
9363
#: en/help_topics/configuration.txt:87
9365
"* the site specific plugin directory if applicable (containing\n"
9366
" the ``site`` plugins)."
9369
#: en/help_topics/configuration.txt:90
9371
"If ``BZR_PLUGIN_PATH`` is set in any fashion, it will change the\n"
9372
"the way the plugin are searched. "
9375
#: en/help_topics/configuration.txt:93
9377
"As for the ``PATH`` variables, if multiple directories are\n"
9378
"specified in ``BZR_PLUGIN_PATH`` they should be separated by the\n"
9379
"platform specific appropriate character (':' on Unix,\n"
9383
#: en/help_topics/configuration.txt:98
9385
"By default if ``BZR_PLUGIN_PATH`` is set, it replaces searching\n"
9386
"in ``user``. However it will continue to search in ``core`` and\n"
9387
"``site`` unless they are explicitly removed."
9390
#: en/help_topics/configuration.txt:102
9392
"If you need to change the order or remove one of these\n"
9393
"directories, you should use special values:"
9396
#: en/help_topics/configuration.txt:105
9398
"* ``-user``, ``-core``, ``-site`` will remove the corresponding\n"
9399
" path from the default values,"
9402
#: en/help_topics/configuration.txt:108
9404
"* ``+user``, ``+core``, ``+site`` will add the corresponding path\n"
9405
" before the remaining default values (and also remove it from\n"
9406
" the default values)."
9409
#: en/help_topics/configuration.txt:112
9411
"Note that the special values 'user', 'core' and 'site' should be\n"
9412
"used literally, they will be substituted by the corresponding,\n"
9413
"platform specific, values."
9416
#: en/help_topics/configuration.txt:116
9418
"The examples below use ':' as the separator, windows users\n"
9422
#: en/help_topics/configuration.txt:119
9423
msgid "Overriding the default user plugin directory::"
9426
#: en/help_topics/configuration.txt:121
9427
msgid " BZR_PLUGIN_PATH='/path/to/my/other/plugins'"
9430
#: en/help_topics/configuration.txt:123
9431
msgid "Disabling the site directory while retaining the user directory::"
9434
#: en/help_topics/configuration.txt:125
9435
msgid " BZR_PLUGIN_PATH='-site:+user'"
9438
#: en/help_topics/configuration.txt:127
9439
msgid "Disabling all plugins (better achieved with --no-plugins)::"
9442
#: en/help_topics/configuration.txt:129
9443
msgid " BZR_PLUGIN_PATH='-user:-core:-site'"
9446
#: en/help_topics/configuration.txt:131
9447
msgid "Overriding the default site plugin directory::"
9450
#: en/help_topics/configuration.txt:133
9451
msgid " BZR_PLUGIN_PATH='/path/to/my/site/plugins:-site':+user"
9454
#: en/help_topics/configuration.txt:135
9456
"BZR_DISABLE_PLUGINS\n"
9457
"~~~~~~~~~~~~~~~~~~~"
9460
#: en/help_topics/configuration.txt:138
9462
"Under special circumstances (mostly when trying to diagnose a\n"
9463
"bug), it's better to disable a plugin (or several) rather than\n"
9464
"uninstalling them completely. Such plugins can be specified in\n"
9465
"the ``BZR_DISABLE_PLUGINS`` environment variable."
9468
#: en/help_topics/configuration.txt:143
9470
"In that case, ``bzr`` will stop loading the specified plugins and\n"
9471
"will raise an import error if they are explicitly imported (by\n"
9472
"another plugin that depends on them for example)."
9475
#: en/help_topics/configuration.txt:147
9476
msgid "Disabling ``myplugin`` and ``yourplugin`` is achieved by::"
9479
#: en/help_topics/configuration.txt:149
9480
msgid " BZR_DISABLE_PLUGINS='myplugin:yourplugin'"
9483
#: en/help_topics/configuration.txt:151
9489
#: en/help_topics/configuration.txt:154
9491
"When adding a new feature or working on a bug in a plugin,\n"
9492
"developers often need to use a specific version of a given\n"
9493
"plugin. Since python requires that the directory containing the\n"
9494
"code is named like the plugin itself this make it impossible to\n"
9495
"use arbitrary directory names (using a two-level directory scheme\n"
9496
"is inconvenient). ``BZR_PLUGINS_AT`` allows such directories even\n"
9497
"if they don't appear in ``BZR_PLUGIN_PATH`` ."
9500
#: en/help_topics/configuration.txt:162
9502
"Plugins specified in this environment variable takes precedence\n"
9503
"over the ones in ``BZR_PLUGIN_PATH``."
9506
#: en/help_topics/configuration.txt:165
9508
"The variable specified a list of ``plugin_name@plugin path``,\n"
9509
"``plugin_name`` being the name of the plugin as it appears in\n"
9510
"python module paths, ``plugin_path`` being the path to the\n"
9511
"directory containing the plugin code itself\n"
9512
"(i.e. ``plugins/myplugin`` not ``plugins``). Use ':' as the list\n"
9513
"separator, use ';' on windows."
9516
#: en/help_topics/configuration.txt:172
9522
#: en/help_topics/configuration.txt:175
9524
"Using a specific version of ``myplugin``:\n"
9525
"``BZR_PLUGINS_AT='myplugin@/home/me/bugfixes/123456-myplugin``"
9528
#: en/help_topics/configuration.txt:178
9534
#: en/help_topics/configuration.txt:181
9535
msgid "The path where Bazaar should look for shell plugin external commands."
9538
#: en/help_topics/configuration.txt:183
9541
"http_proxy, https_proxy\n"
9542
"~~~~~~~~~~~~~~~~~~~~~~~"
9545
#: en/help_topics/configuration.txt:187
9546
msgid "Specifies the network proxy for outgoing connections, for example::"
9549
#: en/help_topics/configuration.txt:189
9551
" http_proxy=http://proxy.example.com:3128/ \n"
9552
" https_proxy=http://proxy.example.com:3128/"
9555
#: en/help_topics/configuration.txt:192
9558
"Configuration files\n"
9559
"-------------------"
9562
#: en/help_topics/configuration.txt:196
9568
#: en/help_topics/configuration.txt:199
9570
"Configuration files are located in ``$HOME/.bazaar`` on Unix and\n"
9571
"``C:\\Documents and Settings\\<username>\\Application Data\\Bazaar\\2.0`` "
9573
"Windows. (You can check the location for your system by using\n"
9577
#: en/help_topics/configuration.txt:204
9578
msgid "There are three primary configuration files in this location:"
9581
#: en/help_topics/configuration.txt:206
9582
msgid "* ``bazaar.conf`` describes default configuration options,"
9585
#: en/help_topics/configuration.txt:208
9587
"* ``locations.conf`` describes configuration information for\n"
9588
" specific branch locations,"
9591
#: en/help_topics/configuration.txt:211
9593
"* ``authentication.conf`` describes credential information for\n"
9597
#: en/help_topics/configuration.txt:214
9599
"Each branch can also contain a configuration file that sets values specific\n"
9600
"to that branch. This file is found at ``.bzr/branch/branch.conf`` within "
9602
"branch. This file is visible to all users of a branch, if you wish to "
9604
"one of the values for a branch with a setting that is specific to you then "
9606
"can do so in ``locations.conf``."
9609
#: en/help_topics/configuration.txt:220
9615
#: en/help_topics/configuration.txt:223
9617
"An ini file has three types of contructs: section headers, section\n"
9618
"options and comments."
9621
#: en/help_topics/configuration.txt:226
9627
#: en/help_topics/configuration.txt:229
9629
"A comment is any line that starts with a \"#\" (sometimes called a \"hash\n"
9630
"mark\", \"pound sign\" or \"number sign\"). Comment lines are ignored by\n"
9631
"Bazaar when parsing ini files."
9634
#: en/help_topics/configuration.txt:233
9640
#: en/help_topics/configuration.txt:236
9642
"A section header is a word enclosed in brackets that starts at the begining\n"
9643
"of a line. A typical section header looks like this::"
9646
#: en/help_topics/configuration.txt:239
9650
#: en/help_topics/configuration.txt:241
9652
"The only valid section headers for bazaar.conf currently are [DEFAULT] and\n"
9653
"[ALIASES]. Section headers are case sensitive. The default section provides "
9655
"setting options which can be overridden with the branch config file."
9658
#: en/help_topics/configuration.txt:245
9660
"For ``locations.conf``, the options from the section with the\n"
9661
"longest matching section header are used to the exclusion of other\n"
9662
"potentially valid section headers. A section header uses the path for\n"
9663
"the branch as the section header. Some examples include::"
9666
#: en/help_topics/configuration.txt:250
9668
" [http://mybranches.isp.com/~jdoe/branchdir]\n"
9669
" [/home/jdoe/branches/]"
9672
#: en/help_topics/configuration.txt:253
9679
#: en/help_topics/configuration.txt:257
9681
"A section option resides within a section. A section option contains an\n"
9682
"option name, an equals sign and a value. For example::"
9685
#: en/help_topics/configuration.txt:260
9687
" email = John Doe <jdoe@isp.com>\n"
9688
" gpg_signing_key = Amy Pond <amy@example.com>"
9691
#: en/help_topics/configuration.txt:263
9693
"A option can reference other options by enclosing them in curly brackets::"
9696
#: en/help_topics/configuration.txt:265
9698
" my_branch_name = feature_x\n"
9699
" my_server = bzr+ssh://example.com\n"
9700
" push_location = {my_server}/project/{my_branch_name}"
9703
#: en/help_topics/configuration.txt:269
9709
#: en/help_topics/configuration.txt:272
9711
"Options defined in a section affect the named directory or URL plus\n"
9712
"any locations they contain. Policies can be used to change how an\n"
9713
"option value is interpreted for contained locations. Currently\n"
9714
"there are three policies available:"
9717
#: en/help_topics/configuration.txt:277
9720
" the value is interpreted the same for contained locations. This is\n"
9721
" the default behaviour.\n"
9723
" the value is only used for the exact location specified by the\n"
9726
" for contained locations, any additional path components are\n"
9727
" appended to the value."
9730
#: en/help_topics/configuration.txt:287
9732
"Policies are specified by keys with names of the form "
9733
"\"<option_name>:policy\".\n"
9734
"For example, to define the push location for a tree of branches, the\n"
9735
"following could be used::"
9738
#: en/help_topics/configuration.txt:291
9740
" [/top/location]\n"
9741
" push_location = sftp://example.com/location\n"
9742
" push_location:policy = appendpath"
9745
#: en/help_topics/configuration.txt:295
9747
"With this configuration, the push location for ``/top/location/branch1``\n"
9748
"would be ``sftp://example.com/location/branch1``."
9751
#: en/help_topics/configuration.txt:298
9753
"Section local options\n"
9754
"^^^^^^^^^^^^^^^^^^^^^"
9757
#: en/help_topics/configuration.txt:301
9759
"Some options are defined automatically inside a given section and can be\n"
9760
"refered to in this section only. "
9763
#: en/help_topics/configuration.txt:304
9764
msgid "For example, the ``appendpath`` policy can be used like this::"
9767
#: en/help_topics/configuration.txt:306
9769
" [/home/vila/src/bzr/bugs]\n"
9770
" mypush = lp:~vila/bzr\n"
9771
" mypush:policy=appendpath"
9774
#: en/help_topics/configuration.txt:310
9775
msgid "Using ``relpath`` to achieve the same result is done like this::"
9778
#: en/help_topics/configuration.txt:312
9780
" [/home/vila/src/bzr/bugs]\n"
9781
" mypush = lp:~vila/bzr/{relpath}"
9784
#: en/help_topics/configuration.txt:315
9786
"In both cases, when used in a directory like\n"
9787
"``/home/vila/src/bzr/bugs/832013-expand-in-stack`` we'll get::"
9790
#: en/help_topics/configuration.txt:318 en/help_topics/configuration.txt:329
9792
" $ bzr config mypush\n"
9793
" lp:~vila/bzr/832013-expand-in-stack"
9796
#: en/help_topics/configuration.txt:321
9797
msgid "Another such option is ``basename`` which can be used like this::"
9800
#: en/help_topics/configuration.txt:323
9802
" [/home/vila/src/bzr]\n"
9803
" mypush = lp:~vila/bzr/{basename}"
9806
#: en/help_topics/configuration.txt:326
9808
"When used in a directory like\n"
9809
"``/home/vila/src/bzr/bugs/832013-expand-in-stack`` we'll get::"
9812
#: en/help_topics/configuration.txt:332
9814
"Note that ``basename`` here refers to the base name of ``relpath`` which\n"
9815
"itself is defined as the relative path between the section name and the\n"
9816
"location it matches."
9819
#: en/help_topics/configuration.txt:336
9821
"Another such option is ``branchname``, which refers to the name of a "
9823
"branch. For non-colocated branches, it behaves like basename. It can be "
9828
#: en/help_topics/configuration.txt:340
9830
" [/home/vila/src/bzr/bugs]\n"
9831
" mypush = lp:~vila/bzr/{branchname}"
9834
#: en/help_topics/configuration.txt:343
9836
"When used with a colocated branch named ``832013-expand-in-stack``, we'll "
9840
#: en/help_topics/configuration.txt:345
9842
" bzr config mypush\n"
9843
" lp:~vila/bzr/832013-expand-in-stack"
9846
#: en/help_topics/configuration.txt:348
9848
"When an option is local to a Section, it cannot be referred to from option\n"
9849
"values in any other section from the same ``Store`` nor from any other\n"
9853
#: en/help_topics/configuration.txt:352
9856
"The main configuration file, bazaar.conf\n"
9857
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
9860
#: en/help_topics/configuration.txt:356
9862
"``bazaar.conf`` allows two sections: ``[DEFAULT]`` and ``[ALIASES]``.\n"
9863
"The default section contains the default\n"
9864
"configuration options for all branches. The default section can be\n"
9865
"overriden by providing a branch-specific section in ``locations.conf``."
9868
#: en/help_topics/configuration.txt:361
9869
msgid "A typical ``bazaar.conf`` section often looks like the following::"
9872
#: en/help_topics/configuration.txt:363
9875
" email = John Doe <jdoe@isp.com>\n"
9876
" editor = /usr/bin/vim\n"
9877
" create_signatures = when-required"
9880
#: en/help_topics/configuration.txt:368
9883
"The branch location configuration file, locations.conf\n"
9884
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
9887
#: en/help_topics/configuration.txt:372
9889
"``locations.conf`` allows one to specify overriding settings for\n"
9890
"a specific branch. The format is almost identical to the default section in\n"
9891
"bazaar.conf with one significant change: The section header, instead of "
9893
"default, will be the path to a branch that you wish to override a value\n"
9894
"for. The '?' and '*' wildcards are supported::"
9897
#: en/help_topics/configuration.txt:378
9899
" [/home/jdoe/branches/nethack]\n"
9900
" email = Nethack Admin <nethack@nethack.com>"
9903
#: en/help_topics/configuration.txt:381
9905
" [http://hypothetical.site.com/branches/devel-branch]\n"
9906
" create_signatures = always"
9909
#: en/help_topics/configuration.txt:384
9911
"The authentication configuration file, authentication.conf\n"
9912
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
9915
#: en/help_topics/configuration.txt:387
9917
"``authentication.conf`` allows one to specify credentials for\n"
9918
"remote servers. This can be used for all the supported transports and any "
9920
"of bzr that requires authentication (smtp for example)."
9923
#: en/help_topics/configuration.txt:391
9925
"The syntax of the file obeys the same rules as the others except for the\n"
9926
"option policies which don't apply."
9929
#: en/help_topics/configuration.txt:394
9931
"For more information on the possible uses of the authentication "
9933
"file see :doc:`authentication-help`."
9936
#: en/help_topics/configuration.txt:397
9943
#: en/help_topics/configuration.txt:401
9949
#: en/help_topics/configuration.txt:404
9951
"A comma-separated list of debugging options to turn on. The same values\n"
9952
"can be used as with the -D command-line option (see `help global-options`).\n"
9956
#: en/help_topics/configuration.txt:408
9957
msgid " debug_flags = hpss"
9960
#: en/help_topics/configuration.txt:412
9961
msgid " debug_flags = hpss,evil"
9964
#: en/help_topics/configuration.txt:414
9970
#: en/help_topics/configuration.txt:417
9972
"The email address to use when committing a branch. Typically takes the form\n"
9976
#: en/help_topics/configuration.txt:420
9977
msgid " email = Full Name <account@hostname.tld>"
9980
#: en/help_topics/configuration.txt:422
9986
#: en/help_topics/configuration.txt:425
9988
"The path of the editor that you wish to use if *bzr commit* is run without\n"
9989
"a commit message. This setting is trumped by the environment variable\n"
9990
"``BZR_EDITOR``, and overrides the ``VISUAL`` and ``EDITOR`` environment\n"
9994
#: en/help_topics/configuration.txt:430
10000
#: en/help_topics/configuration.txt:433
10002
"The default log format to use. Standard log formats are ``long``, ``short``\n"
10003
"and ``line``. Additional formats may be provided by plugins. The default\n"
10004
"value is ``long``."
10007
#: en/help_topics/configuration.txt:437
10009
"check_signatures\n"
10013
#: en/help_topics/configuration.txt:440
10015
"Reserved for future use. These options will allow a policy for branches to\n"
10016
"require signatures."
10019
#: en/help_topics/configuration.txt:443
10022
" The gnupg signature for revisions must be present and must be valid."
10025
#: en/help_topics/configuration.txt:446
10028
" Do not check gnupg signatures of revisions."
10031
#: en/help_topics/configuration.txt:449
10033
"check-available\n"
10034
" (default) If gnupg signatures for revisions are present, check them.\n"
10035
" Bazaar will fail if it finds a bad signature, but will not fail if\n"
10036
" no signature is present."
10039
#: en/help_topics/configuration.txt:454
10041
"create_signatures\n"
10042
"~~~~~~~~~~~~~~~~~"
10045
#: en/help_topics/configuration.txt:457
10047
"Defines the behaviour of signing revisions on commits. By default bzr will "
10049
"sign new commits."
10052
#: en/help_topics/configuration.txt:460
10055
" Sign every new revision that is committed. If the signing fails then "
10057
" commit will not be made."
10060
#: en/help_topics/configuration.txt:464
10063
" Reserved for future use."
10066
#: en/help_topics/configuration.txt:467
10069
" Reserved for future use."
10072
#: en/help_topics/configuration.txt:470
10074
"In future it is planned that ``when-required`` will sign newly\n"
10075
"committed revisions only when the branch requires them. ``never`` will "
10077
"to sign newly committed revisions, even if the branch requires signatures."
10080
#: en/help_topics/configuration.txt:474
10082
"dirstate.fdatasync\n"
10083
"~~~~~~~~~~~~~~~~~~"
10086
#: en/help_topics/configuration.txt:477
10088
"If true (default), working tree metadata changes are flushed through the\n"
10089
"OS buffers to physical disk. This is somewhat slower, but means data\n"
10090
"should not be lost if the machine crashes. See also repository.fdatasync."
10093
#: en/help_topics/configuration.txt:481
10095
"gpg_signing_key\n"
10099
#: en/help_topics/configuration.txt:484
10101
"The GnuPG user identity to use when signing commits. Can be an e-mail\n"
10102
"address, key fingerprint or full key ID. When unset or when set to\n"
10103
"\"default\" Bazaar will use the user e-mail set with ``whoami``."
10106
#: en/help_topics/configuration.txt:488
10112
#: en/help_topics/configuration.txt:491
10114
"Only useful in ``locations.conf``. Defines whether or not the\n"
10115
"configuration for this section applies to subdirectories:"
10118
#: en/help_topics/configuration.txt:494
10121
" (default) This section applies to subdirectories as well."
10124
#: en/help_topics/configuration.txt:497
10127
" This section only applies to the branch at this directory and not\n"
10128
" branches below it."
10131
#: en/help_topics/configuration.txt:501
10133
"gpg_signing_command\n"
10134
"~~~~~~~~~~~~~~~~~~~"
10137
#: en/help_topics/configuration.txt:504
10139
"(Default: \"gpg\"). Which program should be used to sign and check "
10144
#: en/help_topics/configuration.txt:507
10145
msgid " gpg_signing_command = /usr/bin/gnpg"
10148
#: en/help_topics/configuration.txt:509
10150
"The specified command must accept the options \"--clearsign\" and \"-u "
10154
#: en/help_topics/configuration.txt:511
10156
"bzr_remote_path\n"
10160
#: en/help_topics/configuration.txt:514
10162
"(Default: \"bzr\"). The path to the command that should be used to run the "
10164
"server for bzr. This value may only be specified in locations.conf, because:"
10167
#: en/help_topics/configuration.txt:517
10169
"- it's needed before branch.conf is accessible\n"
10170
"- allowing remote branch.conf files to specify commands would be a security\n"
10174
#: en/help_topics/configuration.txt:521
10175
msgid "It is overridden by the BZR_REMOTE_PATH environment variable."
10178
#: en/help_topics/configuration.txt:523
10184
#: en/help_topics/configuration.txt:526
10186
"(Default: \"localhost\"). SMTP server to use when Bazaar needs to send\n"
10187
"email, eg. with ``merge-directive --mail-to``, or the bzr-email plugin."
10190
#: en/help_topics/configuration.txt:529
10192
"smtp_username, smtp_password\n"
10193
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
10196
#: en/help_topics/configuration.txt:532
10198
"User and password to authenticate to the SMTP server. If smtp_username\n"
10199
"is set, and smtp_password is not, Bazaar will prompt for a password.\n"
10200
"These settings are only needed if the SMTP server requires authentication\n"
10204
#: en/help_topics/configuration.txt:537
10206
"locks.steal_dead\n"
10210
#: en/help_topics/configuration.txt:540
10212
"If set to true, bzr will automatically break locks held by processes from\n"
10213
"the same machine and user that are no longer alive. Otherwise, it will\n"
10214
"print a message and you can break the lock manually, if you are satisfied\n"
10215
"the object is no longer in use."
10218
#: en/help_topics/configuration.txt:545
10224
#: en/help_topics/configuration.txt:548
10226
"A mail client to use for sending merge requests.\n"
10227
"By default, bzr will try to use ``mapi`` on Windows. On other platforms, "
10229
"will try ``xdg-email``. If either of these fails, it will fall back to\n"
10233
#: en/help_topics/configuration.txt:553
10234
msgid "Supported values for specific clients:"
10237
#: en/help_topics/configuration.txt:555
10239
":claws: Use Claws. This skips a dialog for attaching files.\n"
10240
":evolution: Use Evolution.\n"
10241
":kmail: Use KMail.\n"
10242
":mutt: Use Mutt.\n"
10243
":thunderbird: Use Mozilla Thunderbird or Icedove. For Thunderbird/Icedove "
10245
" this works around some bugs that xdg-email doesn't handle."
10248
#: en/help_topics/configuration.txt:562
10249
msgid "Supported generic values are:"
10252
#: en/help_topics/configuration.txt:564
10254
":default: See above.\n"
10255
":editor: Use your editor to compose the merge request. This also uses\n"
10256
" your commit id, (see ``bzr whoami``), smtp_server and (optionally)\n"
10257
" smtp_username and smtp_password.\n"
10258
":mapi: Use your preferred e-mail client on Windows.\n"
10259
":xdg-email: Use xdg-email to run your preferred mail program"
10262
#: en/help_topics/configuration.txt:571
10264
"repository.fdatasync\n"
10265
"~~~~~~~~~~~~~~~~~~~~"
10268
#: en/help_topics/configuration.txt:574
10270
"If true (default), repository changes are flushed through the OS buffers\n"
10271
"to physical disk. This is somewhat slower, but means data should not be\n"
10272
"lost if the machine crashes. See also dirstate.fdatasync."
10275
#: en/help_topics/configuration.txt:578
10281
#: en/help_topics/configuration.txt:581
10283
"The branch you intend to submit your current work to. This is "
10285
"set by ``bzr send``, and is also used by the ``submit:`` revision spec. "
10287
"should usually be set on a per-branch or per-location basis."
10290
#: en/help_topics/configuration.txt:585
10296
#: en/help_topics/configuration.txt:588
10298
"A publically-accessible version of this branch (implying that this version "
10300
"not publically-accessible). Used (and set) by ``bzr send``."
10303
#: en/help_topics/configuration.txt:591
10305
"suppress_warnings\n"
10306
"~~~~~~~~~~~~~~~~~"
10309
#: en/help_topics/configuration.txt:594
10311
"A list of strings, each string represent a warning that can be emitted by\n"
10312
"bzr. Mentioning a warning in this list tells bzr to not emit it."
10315
#: en/help_topics/configuration.txt:597
10316
msgid "Valid values:"
10319
#: en/help_topics/configuration.txt:599
10321
"* ``format_deprecation``:\n"
10322
" whether the format deprecation warning is shown on repositories that "
10324
" using deprecated formats."
10327
#: en/help_topics/configuration.txt:603
10333
#: en/help_topics/configuration.txt:606
10335
"A format name for the default format used when creating branches. See "
10337
"help formats`` for possible values."
10340
#: en/help_topics/configuration.txt:609
10343
"Unicode options\n"
10347
#: en/help_topics/configuration.txt:613
10349
"output_encoding\n"
10353
#: en/help_topics/configuration.txt:616
10355
"A Python unicode encoding name for text output from bzr, such as log\n"
10356
"information. Values include: utf8, cp850, ascii, iso-8859-1. The default\n"
10357
"is the terminal encoding prefered by the operating system."
10360
#: en/help_topics/configuration.txt:620
10363
"Branch type specific options\n"
10364
"----------------------------"
10367
#: en/help_topics/configuration.txt:624
10369
"These options apply only to branches that use the ``dirstate-tags`` or\n"
10370
"later format. They\n"
10371
"are usually set in ``.bzr/branch/branch.conf`` automatically, but may be\n"
10372
"manually set in ``locations.conf`` or ``bazaar.conf``."
10375
#: en/help_topics/configuration.txt:629
10377
"append_revisions_only\n"
10378
"~~~~~~~~~~~~~~~~~~~~~"
10381
#: en/help_topics/configuration.txt:632
10383
"If set to \"True\" then revisions can only be appended to the log, not\n"
10384
"removed. A branch with this setting enabled can only pull from another\n"
10385
"branch if the other branch's log is a longer version of its own. This is\n"
10386
"normally set by ``bzr init --append-revisions-only``. If you set it\n"
10387
"manually, use either 'True' or 'False' (case-sensitive) to maintain\n"
10388
"compatibility with previous bzr versions (older than 2.2)."
10391
#: en/help_topics/configuration.txt:639
10393
"parent_location\n"
10397
#: en/help_topics/configuration.txt:642
10399
"If present, the location of the default branch for pull or merge. This "
10401
"is normally set when creating a branch, the first ``pull`` or by ``pull\n"
10405
#: en/help_topics/configuration.txt:646
10411
#: en/help_topics/configuration.txt:649
10413
"If present, the location of the default branch for push. This option\n"
10414
"is normally set by the first ``push`` or ``push --remember``."
10417
#: en/help_topics/configuration.txt:652
10423
#: en/help_topics/configuration.txt:655
10425
"If present, defines the ``--strict`` option default value for checking\n"
10426
"uncommitted changes before pushing."
10429
#: en/help_topics/configuration.txt:658
10435
#: en/help_topics/configuration.txt:661
10437
"If present, defines the ``--strict`` option default value for checking\n"
10438
"uncommitted changes before pushing into a different VCS without any\n"
10439
"custom bzr metadata."
10442
#: en/help_topics/configuration.txt:665
10448
#: en/help_topics/configuration.txt:668
10450
"The location that commits should go to when acting as a checkout.\n"
10451
"This option is normally set by ``bind``."
10454
#: en/help_topics/configuration.txt:671
10460
#: en/help_topics/configuration.txt:674
10462
"If set to \"True\", the branch should act as a checkout, and push each "
10464
"the bound_location. This option is normally set by ``bind``/``unbind``."
10467
#: en/help_topics/configuration.txt:677
10473
#: en/help_topics/configuration.txt:680
10475
"If present, defines the ``--strict`` option default value for checking\n"
10476
"uncommitted changes before sending a merge directive."
10479
#: en/help_topics/configuration.txt:683
10481
"add.maximum_file_size\n"
10482
"~~~~~~~~~~~~~~~~~~~~~"
10485
#: en/help_topics/configuration.txt:686
10487
"Defines the maximum file size the command line \"add\" operation will allow\n"
10488
"in recursive mode, with files larger than this value being skipped. You may "
10490
"specify this value as an integer (in which case it is interpreted as bytes), "
10492
"or you may specify the value using SI units, i.e. 10KB, 20MB, 1G. A value of "
10494
"will disable skipping."
10497
#: en/help_topics/configuration.txt:692
10499
"External Merge Tools\n"
10500
"--------------------"
10503
#: en/help_topics/configuration.txt:695
10505
"bzr.mergetool.<name>\n"
10506
"~~~~~~~~~~~~~~~~~~~~"
10509
#: en/help_topics/configuration.txt:698
10511
"Defines an external merge tool called <name> with the given command-line.\n"
10512
"Arguments containing spaces should be quoted using single or double quotes. "
10514
"executable may omit its path if it can be found on the PATH."
10517
#: en/help_topics/configuration.txt:702
10519
"The following markers can be used in the command-line to substitute "
10521
"involved in the merge conflict::"
10524
#: en/help_topics/configuration.txt:705
10526
" {base} file.BASE\n"
10527
" {this} file.THIS\n"
10528
" {other} file.OTHER\n"
10529
" {result} output file\n"
10530
" {this_temp} temp copy of file.THIS, used to overwrite output file if "
10535
#: en/help_topics/configuration.txt:714
10536
msgid " bzr.mergetool.kdiff3 = kdiff3 {base} {this} {other} -o {result}"
10539
#: en/help_topics/configuration.txt:716
10541
"Because ``mergetool`` and ``config`` itself both use curly braces as\n"
10542
"interpolation markers, trying to display the mergetool line results in the\n"
10543
"following problem::"
10546
#: en/help_topics/configuration.txt:720
10549
" $ bzr config bzr.mergetool.kdiff3='kdiff3 {base} {this} {other} -o "
10551
" $ bzr config bzr.mergetool.kdiff3\n"
10552
" bzr: ERROR: Option base is not defined while expanding \"kdiff3 {base} "
10553
"{this} {other} -o {result}\"."
10556
#: en/help_topics/configuration.txt:725
10558
"To avoid this, ``config`` can be instructed not to try expanding variables::"
10561
#: en/help_topics/configuration.txt:727
10563
" $ bzr config --all bzr.mergetool.kdiff3\n"
10565
" bzr.mergetool.kdiff3 = kdiff3 {base} {this} {other} -o {result}"
10568
#: en/help_topics/configuration.txt:731
10571
"bzr.default_mergetool\n"
10572
"~~~~~~~~~~~~~~~~~~~~~"
10575
#: en/help_topics/configuration.txt:735
10577
"Specifies which external merge tool (as defined above) should be selected "
10579
"default in tools such as ``bzr qconflicts``."
10582
#: en/help_topics/configuration.txt:740
10583
msgid " bzr.default_mergetool = kdiff3\n"
10586
#: en/help_topics/conflict-types.txt:1
10592
#: en/help_topics/conflict-types.txt:4
10594
"Some operations, like merge, revert and pull, modify the contents of your\n"
10595
"working tree. These modifications are programmatically generated, and so "
10597
"may conflict with the current state of your working tree. "
10600
#: en/help_topics/conflict-types.txt:8
10602
"When conflicts are present in your working tree (as shown by ``bzr\n"
10603
"conflicts``), you should resolve them and then inform bzr that the "
10605
"have been resolved."
10608
#: en/help_topics/conflict-types.txt:12
10610
"Resolving conflicts is sometimes not obvious. Either because the user that\n"
10611
"should resolve them is not the one responsible for their occurrence, as is "
10613
"case when merging other people's work or because some conflicts are "
10615
"in a way that is not easy to understand."
10618
#: en/help_topics/conflict-types.txt:17
10620
"Bazaar tries to avoid conflicts ; its aim is to ask you to resolve the\n"
10621
"conflict if and only if there's an actual conceptual conflict in the source\n"
10622
"tree. Because Bazaar doesn't understand the real meaning of the files "
10624
"versioned, it can, when faced with ambiguities, fall short in either "
10626
"trying to resolve the conflict itself. Many kinds of changes can be "
10628
"programmatically, but sometimes only a human can determine the right thing "
10633
#: en/help_topics/conflict-types.txt:25
10635
"When Bazaar generates a conflict, it adds information into the working tree "
10637
"present the conflicting versions, and it's up to you to find the correct\n"
10641
#: en/help_topics/conflict-types.txt:29
10642
msgid "Whatever the conflict is, resolving it is roughly done in two steps:"
10645
#: en/help_topics/conflict-types.txt:31
10647
"1. Modify the working tree content so that the conflicted item is now in "
10649
" state you want to keep, then"
10652
#: en/help_topics/conflict-types.txt:34
10654
"2. Inform Bazaar that the conflict is now solved and ask to cleanup any\n"
10655
" remaining generated information (``bzr resolve <item>``)."
10658
#: en/help_topics/conflict-types.txt:37
10660
"For most conflict types, there are some obvious ways to modify the working\n"
10661
"tree and put it into the desired state. For some types of conflicts, Bazaar\n"
10662
"itself already made a choice, when possible."
10665
#: en/help_topics/conflict-types.txt:41
10667
"Yet, whether Bazaar makes a choice or not, there are some other simple but\n"
10668
"different ways to resolve the conflict."
10671
#: en/help_topics/conflict-types.txt:44
10673
"Each type of conflict is explained below, and the action which must be done "
10675
"resolve the conflict is outlined."
10678
#: en/help_topics/conflict-types.txt:47
10680
"Various actions are available depending on the kind of conflict, for some "
10682
"these actions, Bazaar can provide some help. In the end you should at least\n"
10683
"inform Bazaar that you're done with the conflict with::"
10686
#: en/help_topics/conflict-types.txt:51
10687
msgid " ``bzr resolve FILE --action=done'"
10690
#: en/help_topics/conflict-types.txt:53
10692
"Note that this is the default action when a single file is involved so you "
10697
#: en/help_topics/conflict-types.txt:56
10698
msgid " ``bzr resolve FILE``"
10701
#: en/help_topics/conflict-types.txt:58
10702
msgid "See ``bzr help resolve`` for more details."
10705
#: en/help_topics/conflict-types.txt:60
10711
#: en/help_topics/conflict-types.txt:63 en/help_topics/conflict-types.txt:120
10712
#: en/help_topics/conflict-types.txt:151 en/help_topics/conflict-types.txt:175
10713
#: en/help_topics/conflict-types.txt:198 en/help_topics/conflict-types.txt:213
10714
#: en/help_topics/conflict-types.txt:239 en/help_topics/conflict-types.txt:281
10715
#: en/help_topics/conflict-types.txt:303 en/help_topics/conflict-types.txt:339
10716
msgid "Typical message::"
10719
#: en/help_topics/conflict-types.txt:65
10720
msgid " Text conflict in FILE"
10723
#: en/help_topics/conflict-types.txt:67
10725
"These are produced when a text merge cannot completely reconcile two sets "
10727
"text changes. Bazaar will emit files for each version with the extensions\n"
10728
"THIS, OTHER, and BASE. THIS is the version of the file from the target "
10730
"i.e. the tree that you are merging changes into. OTHER is the version that "
10732
"are merging into the target. BASE is an older version that is used as a "
10737
#: en/help_topics/conflict-types.txt:74
10739
"In the main copy of the file, Bazaar will include all the changes that it\n"
10740
"could reconcile, and any un-reconciled conflicts are surrounded by\n"
10741
"\"herringbone\" markers like ``<<<<<<<``."
10744
#: en/help_topics/conflict-types.txt:78
10746
"Say the initial text is \"The project leader released it.\", and THIS "
10748
"to \"Martin Pool released it.\", while OTHER modifies it to \"The project "
10750
"released Bazaar.\" A conflict would look like this::"
10753
#: en/help_topics/conflict-types.txt:82
10756
" Martin Pool released it.\n"
10758
" The project leader released Bazaar.\n"
10759
" >>>>>>> MERGE-SOURCE"
10762
#: en/help_topics/conflict-types.txt:88
10763
msgid "The correct resolution would be \"Martin Pool released Bazaar.\""
10766
#: en/help_topics/conflict-types.txt:90
10768
"You can handle text conflicts either by editing the main copy of the file,\n"
10769
"or by invoking external tools on the THIS, OTHER and BASE versions. It's\n"
10770
"worth mentioning that resolving text conflicts rarely involves picking one\n"
10771
"set of changes over the other (but see below when you encounter these\n"
10772
"cases). More often, the two sets of changes must be intelligently combined."
10775
#: en/help_topics/conflict-types.txt:96
10777
"If you edit the main copy, be sure to remove the herringbone markers. When\n"
10778
"you are done editing, the file should look like it never had a conflict, and "
10783
#: en/help_topics/conflict-types.txt:100
10785
"When you have resolved text conflicts, just run ``bzr resolve --auto``, and\n"
10786
"Bazaar will auto-detect which conflicts you have resolved."
10789
#: en/help_topics/conflict-types.txt:103
10791
"When the conflict is resolved, Bazaar deletes the previously generated\n"
10792
"``.BASE``, ``.THIS`` and ``.OTHER`` files if they are still present in the\n"
10796
#: en/help_topics/conflict-types.txt:107
10799
"When you want to pick one set of changes over the other, you can use ``bzr\n"
10800
"resolve`` with one of the following actions:"
10803
#: en/help_topics/conflict-types.txt:111
10805
"* ``--action=take-this`` will issue ``mv FILE.THIS FILE``,\n"
10806
"* ``--action=take-other`` will issue ``mv FILE.OTHER FILE``."
10809
#: en/help_topics/conflict-types.txt:114
10811
"Note that if you have modified ``FILE.THIS`` or ``FILE.OTHER``, these\n"
10812
"modifications will be taken into account."
10815
#: en/help_topics/conflict-types.txt:117
10817
"Content conflicts\n"
10818
"-----------------"
10821
#: en/help_topics/conflict-types.txt:122
10822
msgid " Contents conflict in FILE"
10825
#: en/help_topics/conflict-types.txt:124
10827
"This conflict happens when there are conflicting changes in the working "
10829
"and the merge source, but the conflicted items are not text files. They "
10831
"be binary files, or symlinks, or directories. It can even happen with "
10833
"that are deleted on one side, and modified on the other."
10836
#: en/help_topics/conflict-types.txt:129
10838
"Like text conflicts, Bazaar will emit THIS, OTHER and BASE files. (They may "
10840
"regular files, symlinks or directories). But it will not include a \"main "
10842
"of the file with herringbone conflict markers. It will appear that the "
10844
"copy\" has been renamed to THIS or OTHER."
10847
#: en/help_topics/conflict-types.txt:134 en/help_topics/conflict-types.txt:182
10849
"To resolve that kind of conflict, you should rebuild FILE from either "
10851
"or a combination of both."
10854
#: en/help_topics/conflict-types.txt:137 en/help_topics/conflict-types.txt:185
10855
#: en/help_topics/conflict-types.txt:226 en/help_topics/conflict-types.txt:252
10856
#: en/help_topics/conflict-types.txt:291 en/help_topics/conflict-types.txt:326
10857
#: en/help_topics/conflict-types.txt:361
10858
msgid "``bzr resolve`` recognizes the following actions:"
10861
#: en/help_topics/conflict-types.txt:139
10863
"* ``--action=take-this`` will issue ``bzr mv FILE.THIS FILE``,\n"
10864
"* ``--action=take-other`` will issue ``bzr mv FILE.OTHER FILE``,\n"
10865
"* ``--action=done`` will just mark the conflict as resolved."
10868
#: en/help_topics/conflict-types.txt:143
10870
"Any action will also delete the previously generated ``.BASE``, ``.THIS`` "
10872
"``.OTHER`` files if they are still present in the working tree."
10875
#: en/help_topics/conflict-types.txt:146 en/help_topics/conflict-types.txt:193
10876
#: en/help_topics/conflict-types.txt:234 en/help_topics/conflict-types.txt:276
10877
#: en/help_topics/conflict-types.txt:298 en/help_topics/conflict-types.txt:334
10878
#: en/help_topics/conflict-types.txt:369
10880
"Bazaar cannot auto-detect when conflicts of this kind have been resolved."
10883
#: en/help_topics/conflict-types.txt:148
10889
#: en/help_topics/conflict-types.txt:153
10891
" Conflicting tags:\n"
10895
#: en/help_topics/conflict-types.txt:156
10897
"When pulling from or pushing to another branch, Bazaar informs you about "
10899
"that conflict between the two branches; that is the same tag points to two\n"
10900
"different revisions. You need not resolve these conflicts, but subsequent\n"
10901
"uses of pull or push will result in the same message."
10904
#: en/help_topics/conflict-types.txt:161
10906
"To resolve the conflict, you must apply the correct tags to either the "
10908
"branch or the source branch as appropriate. Use \"bzr tags --show-ids -d\n"
10909
"SOURCE_URL\" to see the tags in the source branch. If you want to make the\n"
10910
"target branch's tags match the source branch, then in the target branch do\n"
10911
"``bzr tag --force -r revid:REVISION_ID CONFLICTING_TAG`` for each of the\n"
10912
"CONFLICTING_TAGs, where REVISION_ID comes from the list of tags in the "
10914
"branch. You need not call \"bzr resolve\" after doing this. To resolve in\n"
10915
"favor of the target branch, you need to similarly use ``tag --force`` in "
10917
"source branch. (Note that pulling or pushing using --overwrite will "
10919
"all tags as well.)"
10922
#: en/help_topics/conflict-types.txt:172
10924
"Duplicate paths\n"
10928
#: en/help_topics/conflict-types.txt:177
10929
msgid " Conflict adding file FILE. Moved existing file to FILE.moved."
10932
#: en/help_topics/conflict-types.txt:179
10934
"Sometimes Bazaar will attempt to create a file using a pathname that has\n"
10935
"already been used. The existing file will be renamed to \"FILE.moved\". "
10938
#: en/help_topics/conflict-types.txt:187
10940
"* ``--action=take-this`` will issue ``bzr rm FILE ; bzr mv FILE.moved "
10942
"* ``--action=take-other`` will issue ``bzr rm FILE.moved``,\n"
10943
"* ``--action=done`` will just mark the conflict as resolved."
10946
#: en/help_topics/conflict-types.txt:191
10948
"Note that you must get rid of FILE.moved before using ``--action=done``."
10951
#: en/help_topics/conflict-types.txt:195
10953
"Unversioned parent\n"
10954
"------------------"
10957
#: en/help_topics/conflict-types.txt:200
10959
" Conflict because FILE is not versioned, but has versioned children."
10962
#: en/help_topics/conflict-types.txt:202
10964
"Sometimes Bazaar will attempt to create a file whose parent directory is "
10966
"versioned. This happens when the directory has been deleted in the target,\n"
10967
"but has a new child in the source, or vice versa. In this situation, "
10969
"will version the parent directory as well. Resolving this issue depends\n"
10970
"very much on the particular scenario. You may wish to rename or delete "
10972
"the file or the directory. When you are satisfied, you can run \"bzr "
10974
"FILE\" to mark the conflict as resolved."
10977
#: en/help_topics/conflict-types.txt:210
10983
#: en/help_topics/conflict-types.txt:215
10984
msgid " Conflict adding files to FILE. Created directory."
10987
#: en/help_topics/conflict-types.txt:217
10989
"This happens when a directory has been deleted in the target, but has new\n"
10990
"children in the source. This is similar to the \"unversioned parent\" "
10992
"except that the parent directory does not *exist*, instead of just being\n"
10993
"unversioned. In this situation, Bazaar will create the missing parent.\n"
10994
"Resolving this issue depends very much on the particular scenario."
10997
#: en/help_topics/conflict-types.txt:223 en/help_topics/conflict-types.txt:249
10999
"To resolve that kind of conflict, you should either remove or rename the\n"
11000
"children or the directory or a combination of both."
11003
#: en/help_topics/conflict-types.txt:228
11005
"* ``--action=take-this`` will issue ``bzr rm directory`` including the\n"
11007
"* ``--action=take-other`` will acknowledge Bazaar choice to keep the "
11009
" and restoring the directory,\n"
11010
"* ``--action=done`` will just mark the conflict as resolved."
11013
#: en/help_topics/conflict-types.txt:236
11015
"Deleting parent\n"
11019
#: en/help_topics/conflict-types.txt:241
11020
msgid " Conflict: can't delete DIR because it is not empty. Not deleting."
11023
#: en/help_topics/conflict-types.txt:243
11025
"This is the opposite of \"missing parent\". A directory is deleted in the\n"
11026
"source, but has new children in the target (either because a directory\n"
11027
"deletion is merged or because the merge introduce new children). Bazaar\n"
11028
"will retain the directory. Resolving this issue depends very much on the\n"
11029
"particular scenario."
11032
#: en/help_topics/conflict-types.txt:254
11034
"* ``--action=take-this`` will acknowledge Bazaar choice to keep the "
11038
#: en/help_topics/conflict-types.txt:256
11040
"* ``--action=take-other`` will issue ``bzr rm directory`` including the \n"
11044
#: en/help_topics/conflict-types.txt:259
11045
msgid "* ``--action=done`` will just mark the conflict as resolved."
11048
#: en/help_topics/conflict-types.txt:261
11050
"Note that when merging a directory deletion, if unversioned files are\n"
11051
"present, they become potential orphans has they don't have a directory\n"
11055
#: en/help_topics/conflict-types.txt:265
11057
"Handling such orphans, *before* the conflict is created, is controlled by\n"
11058
"setting the ``bzr.transform.orphan_policy`` configuration option."
11061
#: en/help_topics/conflict-types.txt:268
11062
msgid "There are two possible values for this option:"
11065
#: en/help_topics/conflict-types.txt:270
11067
"* ``conflict`` (the default): will leave the orphans in place and\n"
11068
" generate a conflicts,"
11071
#: en/help_topics/conflict-types.txt:273
11073
"* ``move``: will move the orphans to a ``bzr-orphans`` directory at the "
11075
" of the working tree with names like ``<file>.~#~``."
11078
#: en/help_topics/conflict-types.txt:278
11084
#: en/help_topics/conflict-types.txt:283
11085
msgid " Path conflict: PATH1 / PATH2"
11088
#: en/help_topics/conflict-types.txt:285
11090
"This happens when the source and target have each modified the name or "
11092
"directory of a file. Bazaar will use the path elements from the source."
11095
#: en/help_topics/conflict-types.txt:288
11097
"To resolve that kind of conflict, you just have to decide what name should "
11099
"retained for the file involved."
11102
#: en/help_topics/conflict-types.txt:293
11104
"* ``--action=take-this`` will revert Bazaar choice and keep ``PATH1`` by\n"
11105
" issuing ``bzr mv PATH2 PATH1``,\n"
11106
"* ``--action=take-other`` will acknowledge Bazaar choice of keeping "
11108
"* ``--action=done`` will just mark the conflict as resolved."
11111
#: en/help_topics/conflict-types.txt:300
11117
#: en/help_topics/conflict-types.txt:305
11118
msgid " Conflict moving FILE into DIRECTORY. Cancelled move."
11121
#: en/help_topics/conflict-types.txt:307
11123
"This happens when the source and the target have each moved directories, so\n"
11124
"that, if the change could be applied, a directory would be contained by "
11129
#: en/help_topics/conflict-types.txt:311
11132
" $ bzr mkdir white\n"
11133
" $ bzr mkdir black\n"
11134
" $ bzr commit -m \"BASE\"\n"
11135
" $ bzr branch . ../other\n"
11136
" $ bzr mv white black\n"
11137
" $ bzr commit -m \"THIS\"\n"
11138
" $ bzr mv ../other/black ../other/white\n"
11139
" $ bzr commit ../other -m \"OTHER\"\n"
11140
" $ bzr merge ../other"
11143
#: en/help_topics/conflict-types.txt:322
11145
"In this situation, Bazaar will cancel the move, and leave ``white`` in\n"
11146
"``black``. To resolve that kind of conflict, you just have to decide what\n"
11147
"name should be retained for the directories involved."
11150
#: en/help_topics/conflict-types.txt:328
11152
"* ``--action=take-this`` will acknowledge Bazaar choice of leaving ``white`` "
11155
"* ``--action=take-other`` will revert Bazaar choice and move ``black`` in\n"
11156
" ``white`` by issuing ``bzr mv black/white white ; bzr mv black white``,\n"
11157
"* ``--action=done`` will just mark the conflict as resolved."
11160
#: en/help_topics/conflict-types.txt:336
11162
"Non-directory parent\n"
11163
"--------------------"
11166
#: en/help_topics/conflict-types.txt:341
11168
" Conflict: foo.new is not a directory, but has files in it.\n"
11169
" Created directory."
11172
#: en/help_topics/conflict-types.txt:344
11174
"This happens when one side has added files to a directory, and the other "
11176
"has changed the directory into a file or symlink. For example::"
11179
#: en/help_topics/conflict-types.txt:347
11182
" $ bzr mkdir foo\n"
11183
" $ bzr commit -m \"BASE\"\n"
11184
" $ bzr branch . ../other\n"
11187
" $ bzr commit -m \"THIS\"\n"
11188
" $ bzr mkdir ../other/foo/bar\n"
11189
" $ bzr commit ../other -m \"OTHER\"\n"
11190
" $ bzr merge ../other"
11193
#: en/help_topics/conflict-types.txt:358
11195
"To resolve that kind of conflict, you have to decide what name should be\n"
11196
"retained for the file, directory or symlink involved."
11199
#: en/help_topics/conflict-types.txt:363
11201
"* ``--action=take-this`` will issue ``bzr rm --force foo.new`` and \n"
11202
" ``bzr add foo``,\n"
11203
"* ``--action=take-other`` will issue ``bzr rm --force foo`` and \n"
11204
" ``bzr mv foo.new foo``,\n"
11205
"* ``--action=done`` will just mark the conflict as resolved."
11208
#: en/help_topics/conflict-types.txt:371
11210
"MalformedTransform\n"
11211
"------------------"
11214
#: en/help_topics/conflict-types.txt:374
11216
"It is possible (though very rare) for Bazaar to raise a MalformedTransform\n"
11217
"exception. This means that Bazaar encountered a filesystem conflict that it "
11219
"unable to resolve. This usually indicates a bug. Please let us know if "
11221
"encounter this. Our bug tracker is at https://launchpad.net/bzr/+bugs\n"
11224
#: en/help_topics/content-filters.txt:1
11226
"Content Filters\n"
11230
#: en/help_topics/content-filters.txt:4
11232
"Content formats\n"
11236
#: en/help_topics/content-filters.txt:7
11238
"Bazaar's content filtering allows you to store files in a different\n"
11239
"format from the copy in your working tree. This lets you, or your\n"
11240
"co-developers, use Windows development tools that expect CRLF files\n"
11241
"on projects that use other line-ending conventions. Among other things,\n"
11242
"content filters also let Unix developers more easily work on projects\n"
11243
"using Windows line-ending conventions, keyword expansion/compression,\n"
11244
"and trailing spaces on lines in text files to be implicitly stripped\n"
11248
#: en/help_topics/content-filters.txt:16
11249
msgid "To generalize, there are two content formats supported by Bazaar:"
11252
#: en/help_topics/content-filters.txt:18
11254
"* a canonical format - how files are stored internally\n"
11255
"* a convenience format - how files are created in a working tree."
11258
#: en/help_topics/content-filters.txt:21
11261
"Format conversion\n"
11262
"-----------------"
11265
#: en/help_topics/content-filters.txt:25
11267
"The conversion between these formats is done by content filters.\n"
11268
"A content filter has two parts:"
11271
#: en/help_topics/content-filters.txt:28
11273
"* a read converter - converts from convenience to canonical format\n"
11274
"* a write converter - converts from canonical to convenience format."
11277
#: en/help_topics/content-filters.txt:31
11279
"Many of these converters will provide *round-trip* conversion,\n"
11280
"i.e. applying the read converter followed by the write converter\n"
11281
"gives back the original content. However, others may provide an\n"
11282
"asymmetric conversion. For example, a read converter might strip\n"
11283
"trailing whitespace off lines in source code while the matching\n"
11284
"write converter might pass content through unchanged."
11287
#: en/help_topics/content-filters.txt:38
11290
"Enabling content filters\n"
11291
"------------------------"
11294
#: en/help_topics/content-filters.txt:42
11296
"Content filters are typically provided by plugins, so the first step\n"
11297
"in using them is to install the relevant plugins and read their\n"
11298
"documentation. Some plugins may be very specific about which files\n"
11299
"they filter, e.g. only files ending in ``.java`` or ``.php``.\n"
11300
"In other cases, the plugin may leave it in the user's hands to\n"
11301
"define which files are to be filtered. This is typically done\n"
11302
"using rule-based preferences. See ``bzr help rules`` for general\n"
11303
"information about defining these."
11306
#: en/help_topics/content-filters.txt:51
11309
"Impact on commands\n"
11310
"------------------"
11313
#: en/help_topics/content-filters.txt:55
11315
"Read converters are only applied to commands that read content from\n"
11316
"a working tree, e.g. status, diff and commit. For example, ``bzr diff``\n"
11317
"will apply read converters to files in the working tree, then compare\n"
11318
"the results to the content last committed."
11321
#: en/help_topics/content-filters.txt:60
11323
"Write converters are only applied by commands that **create files in a\n"
11324
"working tree**, e.g. branch, checkout, update. If you wish to see the\n"
11325
"canonical format of a file or tree, use ``bzr cat`` or ``bzr export``\n"
11329
#: en/help_topics/content-filters.txt:65
11331
"Note: ``bzr commit`` does not implicitly apply write converters after\n"
11332
"comitting files. If this makes sense for a given plugin providing\n"
11333
"a content filter, the plugin can usually achieve this effect by using a\n"
11334
"``start_commit`` or ``post_commit`` hook say. See :doc:`hooks-help`\n"
11335
"for more information on hooks."
11338
#: en/help_topics/content-filters.txt:71
11341
"Refreshing your working tree\n"
11342
"----------------------------"
11345
#: en/help_topics/content-filters.txt:75
11347
"For performance reasons, Bazaar caches the timestamps of files in\n"
11348
"a working tree, and assumes files are unchanged if their timestamps\n"
11349
"match the cached values. As a consequence, there are times when\n"
11350
"you may need to explicitly ask for content filtering to be reapplied\n"
11351
"in one or both directions, e.g. after installing or reconfiguring\n"
11352
"plugins providing it."
11355
#: en/help_topics/content-filters.txt:82
11356
msgid "Here are some general guidelines for doing this:"
11359
#: en/help_topics/content-filters.txt:84
11361
" * To reapply read converters, ``touch`` files, i.e. update their\n"
11362
" timestamp. Operations like ``bzr status`` should then reapply the\n"
11363
" relevant read converters and compare the end result with the\n"
11364
" canonical format."
11367
#: en/help_topics/content-filters.txt:89
11369
" * To reapply write converters, ensure there are no local changes,\n"
11370
" delete the relevant files and run ``bzr revert`` on those files."
11373
#: en/help_topics/content-filters.txt:92
11375
"Note: In the future, it is likely that additional options will be added\n"
11376
"to commands to make this refreshing process faster and safer.\n"
11379
#: en/help_topics/current-formats.txt:1
11380
msgid "Current Storage Formats"
11383
#: en/help_topics/current-formats.txt:3
11386
" (native) (default) Format for the bzr 2.0 series. Uses group-\n"
11387
" compress storage. Provides rich roots which are a one-way\n"
11391
#: en/help_topics/current-formats.txt:8 en/help_topics/other-formats.txt:17
11394
"See :doc:`formats-help` for more about storage formats."
11397
#: en/help_topics/debug-flags.txt:1
11403
#: en/help_topics/debug-flags.txt:4
11405
"These flags can be passed on the bzr command line or (without the ``-D``\n"
11406
"prefix) put in the ``debug_flags`` variable in ``bazaar.conf``."
11409
#: en/help_topics/debug-flags.txt:7
11411
"-Dauth Trace authentication sections used.\n"
11412
"-Dbytes Print out how many bytes were transferred\n"
11413
"-Ddirstate Trace dirstate activity (verbose!)\n"
11414
"-Derror Instead of normal error handling, always print a "
11417
"-Devil Capture call sites that do expensive or badly-scaling\n"
11419
"-Dfetch Trace history copying between repositories.\n"
11420
"-Dfilters Emit information for debugging content filtering.\n"
11421
"-Dforceinvdeltas Force use of inventory deltas during generic streaming "
11423
"-Dgraph Trace graph traversal.\n"
11424
"-Dhashcache Log every time a working file is read to determine its "
11426
"-Dhooks Trace hook execution.\n"
11427
"-Dhpss Trace smart protocol requests and responses.\n"
11428
"-Dhpssdetail More hpss details.\n"
11429
"-Dhpssvfs Traceback on vfs access to Remote objects.\n"
11430
"-Dhttp Trace http connections, requests and responses.\n"
11431
"-Dindex Trace major index operations.\n"
11432
"-Dknit Trace knit operations.\n"
11433
"-Dlock Trace when lockdir locks are taken or released.\n"
11434
"-Dnoretry If a connection is reset, fail immediately rather than\n"
11435
" retrying the request.\n"
11436
"-Dprogress Trace progress bar operations.\n"
11437
"-Dmem_dump Dump memory to a file upon an out of memory error.\n"
11438
"-Dmerge Emit information for debugging merges.\n"
11439
"-Dno_apport Don't use apport to report crashes.\n"
11440
"-Dno_activity \t Don't show transport activity indicator in progress bar.\n"
11441
"-Dpack Emit information about pack operations.\n"
11442
"-Drelock Emit a message every time a branch or repository object "
11444
" unlocked then relocked the same way.\n"
11445
"-Dsftp Trace SFTP internals.\n"
11446
"-Dstatic_tuple Error when a tuple is used where a StaticTuple is "
11448
"-Dstream Trace fetch streams.\n"
11449
"-Dstrict_locks Trace when OS locks are potentially used in a non-"
11452
"-Dunlock Some errors during unlock are treated as warnings.\n"
11453
"-DIDS_never Never use InterDifferingSerializer when fetching.\n"
11454
"-DIDS_always Always use InterDifferingSerializer to fetch if "
11456
" for the format, even for non-local fetches.\n"
11459
#: en/help_topics/diverged-branches.txt:1
11461
"Diverged Branches\n"
11462
"================="
11465
#: en/help_topics/diverged-branches.txt:4
11467
"When Bazaar tries to push one branch onto another, it requires that the\n"
11468
"destination branch must be ready to receive the source branch. If this "
11470
"the case, then we say that the branches have ``diverged``. Branches are\n"
11471
"considered diverged if the destination branch's most recent commit is one "
11473
"has not been merged (directly or indirectly) by the source branch. To "
11475
"from diverged branches, one must merge the missing revisions into the "
11480
#: en/help_topics/diverged-branches.txt:12
11482
"This situation commonly arises when using a centralized workflow with local\n"
11483
"commits. If someone else has committed new work to the mainline since your\n"
11484
"last pull and you have local commits that have not yet been pushed to the\n"
11485
"mainline, then your local branch and the mainline have diverged."
11488
#: en/help_topics/diverged-branches.txt:17
11490
"Discovering What Has Diverged\n"
11491
"-----------------------------"
11494
#: en/help_topics/diverged-branches.txt:20
11496
"The ``bzr missing`` command is used to find out what revisions are in "
11498
"branch that are not present in the current branch, and vice-versa. It shows "
11500
"summary of which extra revisions exist in each branch. If you want to see "
11502
"precise effects of those revisions, you can use ``bzr diff --"
11503
"old=other_branch``\n"
11504
"to show the differences between other_branch and your current branch."
11507
#: en/help_topics/diverged-branches.txt:26
11513
#: en/help_topics/diverged-branches.txt:29
11515
"The solution is to merge the revisions from the mainline into your local\n"
11516
"branch. To do so, use ``bzr merge`` to get the new revisions from the\n"
11517
"mainline. This merge may result in conflicts if the other developer's "
11519
"overlap with your changes. These conflicts should be resolved before\n"
11520
"continuing. After any conflicts have been resolved, or even if there were "
11522
"conflicts, Bazaar requires that you explicitly commit these new revisions\n"
11523
"to your local branch. This requirement gives you an opportunity to test "
11525
"resulting working tree for correctness, since the merged revisions could "
11527
"made arbitrary changes. After testing, you should commit the merge using\n"
11528
"``bzr commit``. This clears up the diverged branches situation. Your "
11530
"branch can now be pushed to the mainline.\n"
11533
#: en/help_topics/env-variables.txt:1
11534
msgid "Environment Variables"
11537
#: en/help_topics/env-variables.txt:3
11538
msgid "See bzr help configuration for more details."
11541
#: en/help_topics/env-variables.txt:5
11543
"=================== "
11544
"===========================================================\n"
11545
"BZRPATH Path where bzr is to look for shell plugin external\n"
11547
"BZR_EMAIL E-Mail address of the user. Overrides EMAIL.\n"
11548
"EMAIL E-Mail address of the user.\n"
11549
"BZR_EDITOR Editor for editing commit messages. Overrides EDITOR.\n"
11550
"EDITOR Editor for editing commit messages.\n"
11551
"BZR_PLUGIN_PATH Paths where bzr should look for plugins.\n"
11552
"BZR_DISABLE_PLUGINS Plugins that bzr should not load.\n"
11553
"BZR_PLUGINS_AT Plugins to load from a directory not in "
11554
"BZR_PLUGIN_PATH.\n"
11555
"BZR_HOME Directory holding .bazaar config dir. Overrides HOME.\n"
11556
"BZR_HOME (Win32) Directory holding bazaar config dir. Overrides APPDATA "
11559
"BZR_REMOTE_PATH Full name of remote 'bzr' command (for bzr+ssh:// "
11561
"BZR_SSH Path to SSH client, or one of paramiko, openssh, "
11564
"BZR_LOG Location of .bzr.log (use '/dev/null' to suppress log).\n"
11565
"BZR_LOG (Win32) Location of .bzr.log (use 'NUL' to suppress log).\n"
11566
"BZR_COLUMNS Override implicit terminal width.\n"
11567
"BZR_CONCURRENCY Number of processes that can be run concurrently "
11569
"BZR_PROGRESS_BAR Override the progress display. Values are 'none' or "
11571
"BZR_PDB Control whether to launch a debugger on error.\n"
11572
"BZR_SIGQUIT_PDB Control whether SIGQUIT behaves normally or invokes a\n"
11573
" breakin debugger.\n"
11574
"BZR_TEXTUI_INPUT Force console input mode for prompts to line-based "
11576
" of char-based).\n"
11577
"=================== "
11578
"===========================================================\n"
11581
#: en/help_topics/eol.txt:1
11583
"End of Line Conversion\n"
11584
"======================"
11587
#: en/help_topics/eol.txt:4
11589
"EOL conversion is provided as a content filter where Bazaar internally\n"
11590
"stores a canonical format but outputs a convenience format. See\n"
11591
"``bzr help content-filters`` for general information about using these."
11594
#: en/help_topics/eol.txt:8
11596
"Note: Content filtering is only supported in recently added formats,\n"
11597
"e.g. 1.14. Be sure that both the repository *and* the branch are\n"
11598
"in a recent format. (Just setting the format on the repository\n"
11599
"is not enough.) If content filtering does not appear to be working, use\n"
11600
"'bzr info -v' to confirm that the branch is using \"Working tree format 5\"\n"
11604
#: en/help_topics/eol.txt:15
11606
"EOL conversion needs to be enabled for selected file patterns using\n"
11607
"rules. See ``bzr help rules`` for general information on defining rules.\n"
11608
"Currently, rules are only supported in $BZR_HOME/.bazaar/rules (or\n"
11609
"%BZR_HOME%/bazaar/2.0/rules on Windows). Branch specific rules will be\n"
11610
"supported in a future verison of Bazaar."
11613
#: en/help_topics/eol.txt:21
11615
"To configure which files to filter, set ``eol`` to one of the values below.\n"
11616
"(If a value is not set, ``exact`` is the default.)"
11619
#: en/help_topics/eol.txt:24
11621
" ========== ===================================== ======================\n"
11622
" Value Checkout end-of-lines as Commit end-of-lines as\n"
11623
" ========== ===================================== ======================\n"
11624
" ``native`` ``crlf`` on Windows, ``lf`` otherwise ``lf``\n"
11625
" ---------- ------------------------------------- ----------------------\n"
11626
" ``lf`` ``lf`` ``lf``\n"
11627
" ---------- ------------------------------------- ----------------------\n"
11628
" ``crlf`` ``crlf`` ``lf``\n"
11629
" ---------- ------------------------------------- ----------------------\n"
11630
" ``exact`` No conversion Exactly as in file\n"
11631
" ========== ===================================== ======================"
11634
#: en/help_topics/eol.txt:36
11636
"Note: For safety reasons, no conversion is applied to any file where a null\n"
11637
"byte is detected in the file."
11640
#: en/help_topics/eol.txt:39
11642
"For users working on a cross-platform project, here is a suggested rule\n"
11643
"to use as a starting point::"
11646
#: en/help_topics/eol.txt:42 en/help_topics/eol.txt:52
11647
#: en/help_topics/eol.txt:67 en/help_topics/eol.txt:82
11653
#: en/help_topics/eol.txt:45
11655
"If you have binary files that do not contain a null byte though, be\n"
11656
"sure to add ``eol = exact`` rules for those as well. You can do this\n"
11657
"by giving more explicit patterns earlier in the rules file. For example::"
11660
#: en/help_topics/eol.txt:49
11666
#: en/help_topics/eol.txt:55
11668
"If your working tree is on a network drive shared by users on different\n"
11669
"operating systems, you typically want to force certain conventions for\n"
11670
"certain files. In that way, if a file is created with the wrong line\n"
11671
"endings or line endings get mixed during editing, it gets committed\n"
11672
"correctly and gets checked out correctly. For example::"
11675
#: en/help_topics/eol.txt:61
11681
#: en/help_topics/eol.txt:64
11687
#: en/help_topics/eol.txt:70
11689
"If you take the care to create files with their required endings, you can\n"
11690
"achieve *almost* the same thing by using ``eol = exact``. It is slightly\n"
11691
"safer to use ``lf`` and ``crlf`` though because edits accidentally\n"
11692
"introducing mixed line endings will be corrected during commit for files\n"
11693
"with those settings."
11696
#: en/help_topics/eol.txt:76
11698
"If you have sample test data that deliberately has text files with mixed\n"
11699
"newline conventions, you can ask for those to be left alone like this::"
11702
#: en/help_topics/eol.txt:79
11704
" [name test_data/]\n"
11708
#: en/help_topics/eol.txt:85
11710
"Note that ``exact`` does not imply the file is binary but it does mean\n"
11711
"that no conversion of end-of-lines will be done. (Bazaar currently relies\n"
11712
"of content analysis to detect binary files for commands like ``diff``.\n"
11713
"In the future, a ``binary = true`` rule may be added but it is not\n"
11717
#: en/help_topics/eol.txt:91
11719
"If you have an existing repository with text files already stored using\n"
11720
"Windows newline conventions (``crlf``), then you may want to keep using "
11722
"convention in the repository. Forcing certain files to this convention\n"
11723
"may also help users who do not have rules configured. To do this, set\n"
11724
"``eol`` to one of the values below."
11727
#: en/help_topics/eol.txt:97
11729
" ============================ ======================== "
11730
"======================\n"
11731
" Value Checkout end-of-lines as Commit end-of-lines "
11733
" ============================ ======================== "
11734
"======================\n"
11735
" ``native-with-crlf-in-repo`` ``crlf`` on Windows, ``crlf``\n"
11736
" ``lf`` otherwise\n"
11737
" ---------------------------- ------------------------ ----------------------"
11739
" ``lf-with-crlf-in-repo`` ``lf`` ``crlf``\n"
11740
" ---------------------------- ------------------------ ----------------------"
11742
" ``crlf-with-crlf-in-repo`` ``crlf`` ``crlf``\n"
11743
" ============================ ======================== ======================"
11746
#: en/help_topics/eol.txt:108
11748
"For users working on an existing project that uses Windows newline\n"
11749
"conventions in their Bazaar repository, this rule is suggested as a\n"
11753
#: en/help_topics/eol.txt:112
11756
" eol = native-with-crlf-in-repo"
11759
#: en/help_topics/eol.txt:115
11761
"For new projects, it is recommended that end-of-lines be stored as ``lf``\n"
11762
"and that users stick to the basic settings, i.e. ``native``, ``lf``,\n"
11763
"``crlf`` and ``exact``."
11766
#: en/help_topics/eol.txt:119
11768
"Note: Bazaar's EOL conversion will convert the content of files but\n"
11769
"never reject files because a given line ending or mixed line endings\n"
11770
"are found. A precommit hook should be used if you wish to validate\n"
11771
"(and not just convert) content before committing.\n"
11774
#: en/help_topics/hidden-commands.txt:1
11776
"added List files added in working tree.\n"
11777
"ancestry List all revisions merged into this branch.\n"
11778
"assert-fail Test reporting of assertion failures\n"
11779
"bundle-info Output interesting stats about a bundle\n"
11780
"bundle-revisions Create a merge-directive for submitting changes.\n"
11781
"cat-revision Write out metadata for a revision.\n"
11782
"dump-btree Dump the contents of a btree index file to stdout.\n"
11783
"export-pot Export command helps and error messages in po format.\n"
11784
"file-id Print file_id of a particular file or directory.\n"
11785
"file-path Print path of file_ids to a file or directory.\n"
11786
"find-merge-base Find and print a base revision for merging two "
11788
"hooks Show hooks.\n"
11789
"inventory Show inventory of the current working copy or a "
11791
"local-time-offset Show the offset in seconds from GMT to local time.\n"
11792
"lookup-revision Lookup the revision-id from a revision-number\n"
11793
"merge-directive Generate a merge directive for auto-merge tools.\n"
11794
"modified List files modified in working tree.\n"
11795
"re-sign Create a digital signature for an existing revision.\n"
11796
"reference list, view and set branch locations for nested trees.\n"
11797
"relpath Show path of a file relative to root\n"
11798
"repair-workingtree Reset the working tree state file.\n"
11799
"revision-history Display the list of revision ids on a branch.\n"
11800
"revision-info Show revision number and revision id for a given "
11803
"rocks Statement of optimism.\n"
11804
"selftest Run internal test suite.\n"
11805
"shell-complete Show appropriate completions for context.\n"
11806
"test-script Run a shell-like test from a file.\n"
11807
"touching-revisions Return revision-ids which affected a particular file.\n"
11808
"unknowns List unknown files.\n"
11809
"wait-until-signalled Test helper for\n"
11810
" test_start_and_stop_bzr_subprocess_send_signal.\n"
11813
#: en/help_topics/hooks.txt:1
11820
#: en/help_topics/hooks.txt:5 en/help_topics/rules.txt:4
11826
#: en/help_topics/hooks.txt:8
11827
msgid "A hook of type *xxx* of class *yyy* needs to be registered using::"
11830
#: en/help_topics/hooks.txt:10
11831
msgid " yyy.hooks.install_named_hook(\"xxx\", ...)"
11834
#: en/help_topics/hooks.txt:12
11836
"See :doc:`Using hooks<../user-guide/hooks>` in the User Guide for examples."
11839
#: en/help_topics/hooks.txt:14
11841
"The class that contains each hook is given before the hooks it supplies. "
11843
"instance, BranchHooks as the class is the hooks class for\n"
11844
"`bzrlib.branch.Branch.hooks`."
11847
#: en/help_topics/hooks.txt:18
11849
"Each description also indicates whether the hook runs on the client (the\n"
11850
"machine where bzr was invoked) or the server (the machine addressed by\n"
11851
"the branch URL). These may be, but are not necessarily, the same machine."
11854
#: en/help_topics/hooks.txt:22
11856
"Plugins (including hooks) are run on the server if all of these is true:"
11859
#: en/help_topics/hooks.txt:24
11861
" * The connection is via a smart server (accessed with a URL starting with\n"
11862
" \"bzr://\", \"bzr+ssh://\" or \"bzr+http://\", or accessed via a "
11864
" URL when a smart server is available via HTTP)."
11867
#: en/help_topics/hooks.txt:28
11869
" * The hook is either server specific or part of general infrastructure "
11871
" than client specific code (such as commit)."
11874
#: en/help_topics/hooks.txt:31
11881
#: en/help_topics/hooks.txt:35
11883
"automatic_tag_name\n"
11884
"~~~~~~~~~~~~~~~~~~"
11887
#: en/help_topics/hooks.txt:38 en/help_topics/hooks.txt:56
11888
#: en/help_topics/hooks.txt:102 en/help_topics/hooks.txt:262
11889
msgid "Introduced in: 2.2"
11892
#: en/help_topics/hooks.txt:40
11894
"Called to determine an automatic tag name for a revision.\n"
11895
"automatic_tag_name is called with (branch, revision_id) and should\n"
11896
"return a tag name or None if no tag name could be determined. The\n"
11897
"first non-None tag name returned will be used."
11900
#: en/help_topics/hooks.txt:45
11906
#: en/help_topics/hooks.txt:48 en/help_topics/hooks.txt:293
11907
#: en/help_topics/hooks.txt:307
11908
msgid "Introduced in: 1.8"
11911
#: en/help_topics/hooks.txt:50
11913
"Called with the Branch object that has been opened after a branch is\n"
11917
#: en/help_topics/hooks.txt:53
11919
"post_branch_init\n"
11923
#: en/help_topics/hooks.txt:58
11925
"Called after new branch initialization completes. post_branch_init is\n"
11926
"called with a bzrlib.branch.BranchInitHookParams. Note that init,\n"
11927
"branch and checkout (both heavyweight and lightweight) will all\n"
11928
"trigger this hook."
11931
#: en/help_topics/hooks.txt:63
11933
"post_change_branch_tip\n"
11934
"~~~~~~~~~~~~~~~~~~~~~~"
11937
#: en/help_topics/hooks.txt:66 en/help_topics/hooks.txt:421
11938
msgid "Introduced in: 1.4"
11941
#: en/help_topics/hooks.txt:68
11943
"Called in bzr client and server after a change to the tip of a branch\n"
11944
"is made. post_change_branch_tip is called with a\n"
11945
"bzrlib.branch.ChangeBranchTipParams. Note that push, pull, commit,\n"
11946
"uncommit will all trigger this hook."
11949
#: en/help_topics/hooks.txt:73 en/help_topics/hooks.txt:392
11955
#: en/help_topics/hooks.txt:76 en/help_topics/hooks.txt:86
11956
#: en/help_topics/hooks.txt:94 en/help_topics/hooks.txt:110
11957
msgid "Introduced in: 0.15"
11960
#: en/help_topics/hooks.txt:78
11962
"Called in the bzr client after a commit has completed. post_commit is\n"
11963
"called with (local, master, old_revno, old_revid, new_revno,\n"
11964
"new_revid). old_revid is NULL_REVISION for the first commit to a\n"
11968
#: en/help_topics/hooks.txt:83
11974
#: en/help_topics/hooks.txt:88
11976
"Called after a pull operation completes. post_pull is called with a\n"
11977
"bzrlib.branch.PullResult object and only runs in the bzr client."
11980
#: en/help_topics/hooks.txt:91
11986
#: en/help_topics/hooks.txt:96
11988
"Called after a push operation completes. post_push is called with a\n"
11989
"bzrlib.branch.BranchPushResult object and only runs in the bzr client."
11992
#: en/help_topics/hooks.txt:99
11998
#: en/help_topics/hooks.txt:104
12000
"Called after a checkout switches branch. post_switch is called with a\n"
12001
"bzrlib.branch.SwitchHookParams."
12004
#: en/help_topics/hooks.txt:107
12010
#: en/help_topics/hooks.txt:112
12012
"Called in the bzr client after an uncommit completes. post_uncommit is\n"
12013
"called with (local, master, old_revno, old_revid, new_revno,\n"
12014
"new_revid) where local is the local branch or None, master is the\n"
12015
"target branch, and an empty branch receives new_revno of 0, new_revid\n"
12019
#: en/help_topics/hooks.txt:118
12021
"pre_change_branch_tip\n"
12022
"~~~~~~~~~~~~~~~~~~~~~"
12025
#: en/help_topics/hooks.txt:121
12026
msgid "Introduced in: 1.6"
12029
#: en/help_topics/hooks.txt:123
12031
"Called in bzr client and server before a change to the tip of a branch\n"
12032
"is made. pre_change_branch_tip is called with a\n"
12033
"bzrlib.branch.ChangeBranchTipParams. Note that push, pull, commit,\n"
12034
"uncommit will all trigger this hook."
12037
#: en/help_topics/hooks.txt:128
12043
#: en/help_topics/hooks.txt:131
12044
msgid "Introduced in: 0.91"
12047
#: en/help_topics/hooks.txt:133
12049
"Called after a commit is calculated but before it is completed.\n"
12050
"pre_commit is called with (local, master, old_revno, old_revid,\n"
12051
"future_revno, future_revid, tree_delta, future_tree). old_revid is\n"
12052
"NULL_REVISION for the first commit to a branch, tree_delta is a\n"
12053
"TreeDelta object describing changes from the basis revision. hooks\n"
12054
"MUST NOT modify this delta. future_tree is an in-memory tree obtained\n"
12055
"from CommitBuilder.revision_tree() and hooks MUST NOT modify this\n"
12059
#: en/help_topics/hooks.txt:142
12061
"transform_fallback_location\n"
12062
"~~~~~~~~~~~~~~~~~~~~~~~~~~~"
12065
#: en/help_topics/hooks.txt:145
12066
msgid "Introduced in: 1.9"
12069
#: en/help_topics/hooks.txt:147
12071
"Called when a stacked branch is activating its fallback locations.\n"
12072
"transform_fallback_location is called with (branch, url), and should\n"
12073
"return a new url. Returning the same url allows it to be used as-is,\n"
12074
"returning a different one can be used to cause the branch to stack on\n"
12075
"a closer copy of that fallback_location. Note that the branch cannot\n"
12076
"have history accessing methods called on it during this hook because\n"
12077
"the fallback locations have not been activated. When there are\n"
12078
"multiple hooks installed for transform_fallback_location, all are\n"
12079
"called with the url returned from the previous hook.The order is\n"
12080
"however undefined."
12083
#: en/help_topics/hooks.txt:158
12089
#: en/help_topics/hooks.txt:161
12095
#: en/help_topics/hooks.txt:164
12096
msgid "Introduced in: 1.13"
12099
#: en/help_topics/hooks.txt:166
12101
"Called after creating a command object to allow modifications such as\n"
12102
"adding or removing options, docs etc. Called with the new\n"
12103
"bzrlib.commands.Command object."
12106
#: en/help_topics/hooks.txt:170
12112
#: en/help_topics/hooks.txt:173 en/help_topics/hooks.txt:185
12113
#: en/help_topics/hooks.txt:194 en/help_topics/hooks.txt:467
12114
msgid "Introduced in: 1.17"
12117
#: en/help_topics/hooks.txt:175
12119
"Called when creating a single command. Called with (cmd_or_None,\n"
12120
"command_name). get_command should either return the cmd_or_None\n"
12121
"parameter, or a replacement Command object that should be used for the\n"
12122
"command. Note that the Command.hooks hooks are core infrastructure.\n"
12123
"Many users will prefer to use bzrlib.commands.register_command or\n"
12124
"plugin_cmds.register_lazy."
12127
#: en/help_topics/hooks.txt:182
12129
"get_missing_command\n"
12130
"~~~~~~~~~~~~~~~~~~~"
12133
#: en/help_topics/hooks.txt:187
12135
"Called when creating a single command if no command could be found.\n"
12136
"Called with (command_name). get_missing_command should either return\n"
12137
"None, or a Command object to be used for the command."
12140
#: en/help_topics/hooks.txt:191
12146
#: en/help_topics/hooks.txt:196
12148
"Called when enumerating commands. Called with a set of cmd_name\n"
12149
"strings for all the commands found so far. This set is safe to mutate\n"
12150
"- e.g. to remove a command. list_commands should return the updated\n"
12151
"set of command names."
12154
#: en/help_topics/hooks.txt:201
12160
#: en/help_topics/hooks.txt:204 en/help_topics/hooks.txt:211
12161
msgid "Introduced in: 2.6"
12164
#: en/help_topics/hooks.txt:206
12165
msgid "Called after executing a command. Called with the command object."
12168
#: en/help_topics/hooks.txt:208
12174
#: en/help_topics/hooks.txt:213
12175
msgid "Called prior to executing a command. Called with the command object."
12178
#: en/help_topics/hooks.txt:215
12184
#: en/help_topics/hooks.txt:218
12190
#: en/help_topics/hooks.txt:221 en/help_topics/hooks.txt:229
12191
#: en/help_topics/hooks.txt:236 en/help_topics/hooks.txt:244
12192
#: en/help_topics/hooks.txt:251 en/help_topics/hooks.txt:373
12193
#: en/help_topics/hooks.txt:446
12194
msgid "Introduced in: 2.4"
12197
#: en/help_topics/hooks.txt:223
12199
"Invoked when a config option is read. The signature is (stack, name,\n"
12203
#: en/help_topics/hooks.txt:226
12209
#: en/help_topics/hooks.txt:231
12210
msgid "Invoked when a config store is loaded. The signature is (store)."
12213
#: en/help_topics/hooks.txt:233
12219
#: en/help_topics/hooks.txt:238
12221
"Invoked when a config option is removed. The signature is (stack,\n"
12225
#: en/help_topics/hooks.txt:241
12231
#: en/help_topics/hooks.txt:246
12232
msgid "Invoked when a config store is saved. The signature is (store)."
12235
#: en/help_topics/hooks.txt:248
12241
#: en/help_topics/hooks.txt:253
12243
"Invoked when a config option is set. The signature is (stack, name,\n"
12247
#: en/help_topics/hooks.txt:256
12249
"ControlDirHooks\n"
12253
#: en/help_topics/hooks.txt:259
12259
#: en/help_topics/hooks.txt:264
12261
"Invoked after a repository has been initialized. post_repo_init is\n"
12262
"called with a bzrlib.controldir.RepoInitHookParams."
12265
#: en/help_topics/hooks.txt:267
12271
#: en/help_topics/hooks.txt:270
12272
msgid "Introduced in: 1.14"
12275
#: en/help_topics/hooks.txt:272
12277
"Invoked before attempting to open a ControlDir with the transport that\n"
12278
"the open will use."
12281
#: en/help_topics/hooks.txt:275
12287
#: en/help_topics/hooks.txt:278
12293
#: en/help_topics/hooks.txt:281 en/help_topics/hooks.txt:300
12294
#: en/help_topics/hooks.txt:524
12295
msgid "Introduced in: 1.15"
12298
#: en/help_topics/hooks.txt:283
12300
"Invoked when displaying the statistics for a repository. repository is\n"
12301
"called with a statistics dictionary as returned by the repository and\n"
12302
"a file-like object to write to."
12305
#: en/help_topics/hooks.txt:287
12311
#: en/help_topics/hooks.txt:290
12317
#: en/help_topics/hooks.txt:295
12319
"Called with a bzrlib.lock.LockResult when a physical lock is acquired."
12322
#: en/help_topics/hooks.txt:297
12328
#: en/help_topics/hooks.txt:302
12329
msgid "Called with a bzrlib.lock.LockResult when a physical lock is broken."
12332
#: en/help_topics/hooks.txt:304
12338
#: en/help_topics/hooks.txt:309
12340
"Called with a bzrlib.lock.LockResult when a physical lock is released."
12343
#: en/help_topics/hooks.txt:311
12349
#: en/help_topics/hooks.txt:314
12351
"merge_file_content\n"
12352
"~~~~~~~~~~~~~~~~~~"
12355
#: en/help_topics/hooks.txt:317
12356
msgid "Introduced in: 2.1"
12359
#: en/help_topics/hooks.txt:319
12361
"Called with a bzrlib.merge.Merger object to create a per file merge\n"
12362
"object when starting a merge. Should return either None or a subclass\n"
12363
"of ``bzrlib.merge.AbstractPerFileMerger``. Such objects will then be\n"
12364
"called per file that needs to be merged (including when one side has\n"
12365
"deleted the file and the other has changed it). See the\n"
12366
"AbstractPerFileMerger API docs for details on how it is used by merge."
12369
#: en/help_topics/hooks.txt:326
12375
#: en/help_topics/hooks.txt:329 en/help_topics/hooks.txt:337
12376
#: en/help_topics/hooks.txt:387 en/help_topics/hooks.txt:405
12377
#: en/help_topics/hooks.txt:413 en/help_topics/hooks.txt:512
12378
msgid "Introduced in: 2.5"
12381
#: en/help_topics/hooks.txt:331
12383
"Called after a merge. Receives a Merger object as the single argument.\n"
12384
"The return value is ignored."
12387
#: en/help_topics/hooks.txt:334
12393
#: en/help_topics/hooks.txt:339
12395
"Called before a merge. Receives a Merger object as the single\n"
12399
#: en/help_topics/hooks.txt:342
12401
"MergeDirectiveHooks\n"
12402
"-------------------"
12405
#: en/help_topics/hooks.txt:345
12407
"merge_request_body\n"
12408
"~~~~~~~~~~~~~~~~~~"
12411
#: en/help_topics/hooks.txt:348
12412
msgid "Introduced in: 1.15.0"
12415
#: en/help_topics/hooks.txt:350
12417
"Called with a MergeRequestBodyParams when a body is needed for a merge\n"
12418
"request. Callbacks must return a body. If more than one callback is\n"
12419
"registered, the output of one callback is provided to the next."
12422
#: en/help_topics/hooks.txt:354
12424
"MessageEditorHooks\n"
12425
"------------------"
12428
#: en/help_topics/hooks.txt:357
12430
"commit_message_template\n"
12431
"~~~~~~~~~~~~~~~~~~~~~~~"
12434
#: en/help_topics/hooks.txt:360
12435
msgid "Introduced in: 1.10"
12438
#: en/help_topics/hooks.txt:362
12440
"Called when a commit message is being generated.\n"
12441
"commit_message_template is called with the bzrlib.commit.Commit object\n"
12442
"and the message that is known so far. commit_message_template must\n"
12443
"return a new message to use (which could be the same as it was given).\n"
12444
"When there are multiple hooks registered for commit_message_template,\n"
12445
"they are chained with the result from the first passed into the\n"
12446
"second, and so on."
12449
#: en/help_topics/hooks.txt:370
12451
"set_commit_message\n"
12452
"~~~~~~~~~~~~~~~~~~"
12455
#: en/help_topics/hooks.txt:375
12457
"Set a fixed commit message. set_commit_message is called with the\n"
12458
"bzrlib.commit.Commit object (so you can also change e.g. revision\n"
12459
"properties by editing commit.builder._revprops) and the message so\n"
12460
"far. set_commit_message must return the message to use or None if it\n"
12461
"should use the message editor as normal."
12464
#: en/help_topics/hooks.txt:381
12466
"MutableTreeHooks\n"
12470
#: en/help_topics/hooks.txt:384
12472
"post_build_tree\n"
12476
#: en/help_topics/hooks.txt:389
12478
"Called after a completely new tree is built. The hook is called with\n"
12479
"the tree as its only argument."
12482
#: en/help_topics/hooks.txt:395
12483
msgid "Introduced in: 2.0"
12486
#: en/help_topics/hooks.txt:397
12488
"Called after a commit is performed on a tree. The hook is called with\n"
12489
"a bzrlib.mutabletree.PostCommitHookParams object. The mutable tree the\n"
12490
"commit was performed on is available via the mutable_tree attribute of\n"
12494
#: en/help_topics/hooks.txt:402
12500
#: en/help_topics/hooks.txt:407
12502
"Called after a tree transform has been performed on a tree. The hook\n"
12503
"is called with the tree that is being transformed and the transform."
12506
#: en/help_topics/hooks.txt:410
12512
#: en/help_topics/hooks.txt:415
12514
"Called before a tree transform on this tree. The hook is called with\n"
12515
"the tree that is being transformed and the transform."
12518
#: en/help_topics/hooks.txt:418
12524
#: en/help_topics/hooks.txt:423
12526
"Called before a commit is performed on a tree. The start commit hook\n"
12527
"is able to change the tree before the commit takes place. start_commit\n"
12528
"is called with the bzrlib.mutabletree.MutableTree that the commit is\n"
12529
"being performed on."
12532
#: en/help_topics/hooks.txt:428
12534
"SmartClientHooks\n"
12538
#: en/help_topics/hooks.txt:431
12544
#: en/help_topics/hooks.txt:434
12545
msgid "Introduced in: unknown"
12548
#: en/help_topics/hooks.txt:436
12550
"Called when the smart client is submitting a request to the smart\n"
12551
"server. Called with a bzrlib.smart.client.CallHookParams object.\n"
12552
"Streaming request bodies, and responses, are not accessible."
12555
#: en/help_topics/hooks.txt:440
12557
"SmartServerHooks\n"
12561
#: en/help_topics/hooks.txt:443
12563
"server_exception\n"
12567
#: en/help_topics/hooks.txt:448
12569
"Called by the bzr server when an exception occurs. server_exception is\n"
12570
"called with the sys.exc_info() tuple return true for the hook if the\n"
12571
"exception has been handled, in which case the server will exit\n"
12575
#: en/help_topics/hooks.txt:453
12581
#: en/help_topics/hooks.txt:456 en/help_topics/hooks.txt:475
12582
msgid "Introduced in: 0.16"
12585
#: en/help_topics/hooks.txt:458
12587
"Called by the bzr server when it starts serving a directory.\n"
12588
"server_started is called with (backing urls, public url), where\n"
12589
"backing_url is a list of URLs giving the server-specific directory\n"
12590
"locations, and public_url is the public URL for the directory being\n"
12594
#: en/help_topics/hooks.txt:464
12596
"server_started_ex\n"
12597
"~~~~~~~~~~~~~~~~~"
12600
#: en/help_topics/hooks.txt:469
12602
"Called by the bzr server when it starts serving a directory.\n"
12603
"server_started is called with (backing_urls, server_obj)."
12606
#: en/help_topics/hooks.txt:472
12612
#: en/help_topics/hooks.txt:477
12614
"Called by the bzr server when it stops serving a directory.\n"
12615
"server_stopped is called with the same parameters as the\n"
12616
"server_started hook: (backing_urls, public_url)."
12619
#: en/help_topics/hooks.txt:481
12625
#: en/help_topics/hooks.txt:484
12631
#: en/help_topics/hooks.txt:487 en/help_topics/hooks.txt:498
12632
msgid "Introduced in: 2.3"
12635
#: en/help_topics/hooks.txt:489
12637
"Called with argument StatusHookParams after Bazaar has displayed the\n"
12638
"status. StatusHookParams has the attributes (old_tree, new_tree,\n"
12639
"to_file, versioned, show_ids, short, verbose). The last four arguments\n"
12640
"correspond to the command line options specified by the user for the\n"
12641
"status command. to_file is the output stream for writing."
12644
#: en/help_topics/hooks.txt:495
12650
#: en/help_topics/hooks.txt:500
12652
"Called with argument StatusHookParams before Bazaar displays the\n"
12653
"status. StatusHookParams has the attributes (old_tree, new_tree,\n"
12654
"to_file, versioned, show_ids, short, verbose). The last four arguments\n"
12655
"correspond to the command line options specified by the user for the\n"
12656
"status command. to_file is the output stream for writing."
12659
#: en/help_topics/hooks.txt:506
12665
#: en/help_topics/hooks.txt:509
12671
#: en/help_topics/hooks.txt:514
12673
"Called after a new connection is established or a reconnect occurs.\n"
12674
"The sole argument passed is either the connected transport or smart\n"
12678
#: en/help_topics/hooks.txt:518
12680
"RioVersionInfoBuilderHooks\n"
12681
"--------------------------"
12684
#: en/help_topics/hooks.txt:521
12690
#: en/help_topics/hooks.txt:526
12692
"Invoked when adding information about a revision to the RIO stanza\n"
12693
"that is printed. revision is called with a revision object and a RIO\n"
12697
#: en/help_topics/location-alias.txt:1
12699
"Location aliases\n"
12703
#: en/help_topics/location-alias.txt:4
12705
"Bazaar defines several aliases for locations associated with a branch. "
12707
"can be used with most commands that expect a location, such as `bzr push`."
12710
#: en/help_topics/location-alias.txt:7
12711
msgid "The aliases are::"
12714
#: en/help_topics/location-alias.txt:9
12716
" :bound The branch this branch is bound to, for bound branches.\n"
12717
" :parent The parent of this branch.\n"
12718
" :public The public location of this branch.\n"
12719
" :push The saved location used for `bzr push` with no arguments.\n"
12720
" :submit The submit branch for this branch.\n"
12721
" :this This branch."
12724
#: en/help_topics/location-alias.txt:16
12725
msgid "For example, to push to the parent location::"
12728
#: en/help_topics/location-alias.txt:18
12729
msgid " bzr push :parent\n"
12732
#: en/help_topics/log-formats.txt:1
12738
#: en/help_topics/log-formats.txt:4
12740
"A log format controls how information about each revision is displayed.\n"
12741
"The standard log formats are compared below::"
12744
#: en/help_topics/log-formats.txt:7
12746
" Feature long short line\n"
12747
" ---------------------- ------------- ------------ -------------------\n"
12748
" design goal detailed view concise view 1 revision per line\n"
12749
" committer name+email name only name only\n"
12750
" author name+email - -\n"
12751
" date-time format full date only date only\n"
12752
" commit message full full top line\n"
12753
" tags yes yes yes\n"
12754
" merges indicator - yes -\n"
12755
" status/delta optional optional -\n"
12756
" diff/patch optional optional -\n"
12757
" revision-id optional optional -\n"
12758
" branch nick yes - -\n"
12759
" foreign vcs properties yes yes -\n"
12760
" preferred levels all 1 1\n"
12761
" digital signature optional - -"
12764
#: en/help_topics/log-formats.txt:24
12766
"The default format is ``long``. To change this, define the ``log_format``\n"
12767
"setting in the ``[DEFAULT]`` section of ``bazaar.conf`` like this (say)::"
12770
#: en/help_topics/log-formats.txt:27
12773
" log_format = short"
12776
#: en/help_topics/log-formats.txt:30
12778
"Alternatively, to change the log format used for a given query, use the\n"
12779
"--long, --short or --line options."
12782
#: en/help_topics/log-formats.txt:33
12784
"If one of the standard log formats does not meet your needs, additional\n"
12785
"formats can be provided by plugins.\n"
12788
#: en/help_topics/other-formats.txt:1
12789
msgid "Other Storage Formats"
12792
#: en/help_topics/other-formats.txt:3
12793
msgid "Experimental formats are shown below."
12796
#: en/help_topics/other-formats.txt:5
12798
":development-colo:\n"
12799
" (native) The 2a format with experimental support for colocated\n"
12803
#: en/help_topics/other-formats.txt:9
12806
"Deprecated formats are shown below."
12809
#: en/help_topics/other-formats.txt:12
12812
" (native) Pack-based format used in 1.x series. Introduced in 0.92.\n"
12813
" Interoperates with bzr repositories before 0.92 but cannot be read\n"
12817
#: en/help_topics/patterns.txt:1
12823
#: en/help_topics/patterns.txt:4
12825
"Bazaar uses patterns to match files at various times. For example,\n"
12826
"the ``add`` command skips over files that match ignore patterns\n"
12827
"and preferences can be associated with files using rule patterns.\n"
12828
"The pattern syntax is described below."
12831
#: en/help_topics/patterns.txt:9
12833
"Trailing slashes on patterns are ignored. If the pattern contains a\n"
12834
"slash or is a regular expression, it is compared to the whole path\n"
12835
"from the branch root. Otherwise, it is compared to only the last\n"
12836
"component of the path. To match a file only in the root directory,\n"
12837
"prepend ``./``. Patterns specifying absolute paths are not allowed."
12840
#: en/help_topics/patterns.txt:15
12841
msgid "Patterns may include globbing wildcards such as::"
12844
#: en/help_topics/patterns.txt:17
12846
" ? - Matches any single character except '/'\n"
12847
" * - Matches 0 or more characters except '/'\n"
12848
" /**/ - Matches 0 or more directories in a path\n"
12849
" [a-z] - Matches a single character from within a group of characters"
12852
#: en/help_topics/patterns.txt:22
12854
"Patterns may also be `Python regular expressions`_. Regular expression\n"
12855
"patterns are identified by a ``RE:`` prefix followed by the regular\n"
12856
"expression. Regular expression patterns may not include named or\n"
12860
#: en/help_topics/patterns.txt:27
12862
"Case insensitive ignore patterns can be specified with regular expressions\n"
12863
"by using the ``i`` (for ignore case) flag in the pattern."
12866
#: en/help_topics/patterns.txt:30
12868
"For example, a case insensitive match for ``foo`` may be specified as::"
12871
#: en/help_topics/patterns.txt:32
12872
msgid " RE:(?i)foo"
12875
#: en/help_topics/patterns.txt:34
12877
"Ignore patterns may be prefixed with ``!``, which means that a filename\n"
12878
"matched by that pattern will not be ignored."
12881
#: en/help_topics/patterns.txt:37
12883
".. _Python regular expressions: http://docs.python.org/library/re.html"
12886
#: en/help_topics/revisionspec.txt:1
12887
msgid "Revision Identifiers"
12890
#: en/help_topics/revisionspec.txt:3
12892
"A revision identifier refers to a specific state of a branch's history. It\n"
12893
"can be expressed in several ways. It can begin with a keyword to\n"
12894
"unambiguously specify a given lookup type; some examples are 'last:1',\n"
12895
"'before:yesterday' and 'submit:'."
12898
#: en/help_topics/revisionspec.txt:8
12900
"Alternately, it can be given without a keyword, in which case it will be\n"
12901
"checked as a revision number, a tag, a revision id, a date specification, or "
12903
"branch specification, in that order. For example, 'date:today' could be\n"
12904
"written as simply 'today', though if you have a tag called 'today' that "
12909
#: en/help_topics/revisionspec.txt:14
12911
"If 'REV1' and 'REV2' are revision identifiers, then 'REV1..REV2' denotes a\n"
12912
"revision range. Examples: '3647..3649', 'date:yesterday..-1' and\n"
12913
"'branch:/path/to/branch1/..branch:/branch2' (note that there are no quotes "
12915
"spaces around the '..')."
12918
#: en/help_topics/revisionspec.txt:19
12920
"Ranges are interpreted differently by different commands. To the \"log\" "
12922
"a range is a sequence of log messages, but to the \"diff\" command, the "
12924
"denotes a change between revisions (and not a sequence of changes). In\n"
12925
"addition, \"log\" considers a closed range whereas \"diff\" and \"merge\" "
12927
"to be open-ended, that is, they include one end but not the other. For "
12929
"\"bzr log -r 3647..3649\" shows the messages of revisions 3647, 3648 and "
12931
"while \"bzr diff -r 3647..3649\" includes the changes done in revisions 3648 "
12933
"3649, but not 3647."
12936
#: en/help_topics/revisionspec.txt:28
12937
msgid "The keywords used as revision selection methods are the following:"
12940
#: en/help_topics/revisionspec.txt:30
12943
"\tSelects a revision using the revision id.\n"
12945
"\tSelects a common ancestor with the submit branch.\n"
12947
"\tSelects a common ancestor with a second branch.\n"
12949
"\tSelects a revision on the basis of a datestamp.\n"
12951
"\tSelects the last revision of a specified branch.\n"
12953
"\tSelects a revision identified by a tag name.\n"
12955
"\tSelects a revision using a number.\n"
12957
"\tSelects the parent of the revision specified.\n"
12959
"\tSelect the revision that last modified the specified line.\n"
12961
"\tSelect mainline revision that merged the specified revision.\n"
12963
"\tSelects the nth revision from the end."
12966
#: en/help_topics/revisionspec.txt:53
12967
msgid "In addition, plugins can provide other keywords."
12970
#: en/help_topics/revisionspec.txt:55
12971
msgid "A detailed description of each keyword is given below."
12974
#: en/help_topics/revisionspec.txt:57
12978
#: en/help_topics/revisionspec.txt:59
12980
" Supply a specific revision id, that can be used to specify any\n"
12981
" revision id in the ancestry of the branch.\n"
12982
" Including merges, and pending merges.\n"
12986
#: en/help_topics/revisionspec.txt:64
12988
" revid:aaaa@bbbb-123456789 -> Select revision 'aaaa@bbbb-123456789'"
12991
#: en/help_topics/revisionspec.txt:66
12995
#: en/help_topics/revisionspec.txt:68
12997
" Diffing against this shows all the changes that were made in this "
12999
" and is a good predictor of what merge will do. The submit branch is\n"
13000
" used by the bundle and merge directive commands. If no submit branch\n"
13001
" is specified, the parent branch is used instead."
13004
#: en/help_topics/revisionspec.txt:73 en/help_topics/revisionspec.txt:85
13006
" The common ancestor is the last revision that existed in both\n"
13007
" branches. Usually this is the branch point, but it could also be\n"
13008
" a revision that was merged."
13011
#: en/help_topics/revisionspec.txt:77 en/help_topics/revisionspec.txt:93
13012
#: en/help_topics/revisionspec.txt:109 en/help_topics/revisionspec.txt:119
13013
#: en/help_topics/revisionspec.txt:153
13014
msgid " Examples::"
13017
#: en/help_topics/revisionspec.txt:79
13018
msgid " $ bzr diff -r submit:"
13021
#: en/help_topics/revisionspec.txt:81
13025
#: en/help_topics/revisionspec.txt:83
13026
msgid " Supply the path to a branch to select the common ancestor."
13029
#: en/help_topics/revisionspec.txt:89
13031
" This is frequently used with 'diff' to return all of the changes\n"
13032
" that your branch introduces, while excluding the changes that you\n"
13033
" have not merged from the remote branch."
13036
#: en/help_topics/revisionspec.txt:95
13038
" ancestor:/path/to/branch\n"
13039
" $ bzr diff -r ancestor:../../mainline/branch"
13042
#: en/help_topics/revisionspec.txt:98
13046
#: en/help_topics/revisionspec.txt:100
13048
" Supply a datestamp to select the first revision that matches the date.\n"
13049
" Date can be 'yesterday', 'today', 'tomorrow' or a YYYY-MM-DD string.\n"
13050
" Matches the first entry after a given date (either at midnight or\n"
13051
" at a specified time)."
13054
#: en/help_topics/revisionspec.txt:105
13055
msgid " One way to display all the changes since yesterday would be::"
13058
#: en/help_topics/revisionspec.txt:107
13059
msgid " bzr log -r date:yesterday.."
13062
#: en/help_topics/revisionspec.txt:111
13064
" date:yesterday -> select the first revision since "
13066
" date:2006-08-14,17:10:14 -> select the first revision after\n"
13067
" August 14th, 2006 at 5:10pm."
13070
#: en/help_topics/revisionspec.txt:115
13074
#: en/help_topics/revisionspec.txt:117
13075
msgid " Supply the path to a branch to select its last revision."
13078
#: en/help_topics/revisionspec.txt:121
13079
msgid " branch:/path/to/branch"
13082
#: en/help_topics/revisionspec.txt:123
13086
#: en/help_topics/revisionspec.txt:125
13087
msgid " Tags are stored in the branch and created by the 'tag' command."
13090
#: en/help_topics/revisionspec.txt:127
13094
#: en/help_topics/revisionspec.txt:129
13096
" Use an integer to specify a revision in the history of the branch.\n"
13097
" Optionally a branch can be specified. A negative number will count\n"
13098
" from the end of the branch (-1 is the last revision, -2 the previous\n"
13099
" one). If the negative number is larger than the branch's history, the\n"
13100
" first revision is returned.\n"
13104
#: en/help_topics/revisionspec.txt:136
13106
" revno:1 -> return the first revision of this branch\n"
13107
" revno:3:/path/to/branch -> return the 3rd revision of\n"
13108
" the branch '/path/to/branch'\n"
13109
" revno:-1 -> The last revision in a branch.\n"
13110
" -2:http://other/branch -> The second to last revision in the\n"
13111
" remote branch.\n"
13112
" -1000000 -> Most likely the first revision, unless\n"
13113
" your history is very long."
13116
#: en/help_topics/revisionspec.txt:145
13120
#: en/help_topics/revisionspec.txt:147
13122
" Supply any revision spec to return the parent of that revision. This "
13124
" mostly useful when inspecting revisions that are not in the revision "
13129
#: en/help_topics/revisionspec.txt:151
13131
" It is an error to request the parent of the null revision (before:0)."
13134
#: en/help_topics/revisionspec.txt:155
13136
" before:1913 -> Return the parent of revno 1913 (revno 1912)\n"
13137
" before:revid:aaaa@bbbb-1234567890 -> return the parent of revision\n"
13138
" aaaa@bbbb-1234567890\n"
13139
" bzr diff -r before:1913..1913\n"
13140
" -> Find the changes between revision 1913 and its parent "
13142
" (What changes did revision 1913 introduce).\n"
13143
" This is equivalent to: bzr diff -c 1913"
13146
#: en/help_topics/revisionspec.txt:163
13150
#: en/help_topics/revisionspec.txt:165
13152
" Select the revision that last modified the specified line. Line is\n"
13153
" specified as path:number. Path is a relative path to the file. "
13155
" start at 1, and are relative to the current version, not the last-\n"
13156
" committed version of the file."
13159
#: en/help_topics/revisionspec.txt:170
13163
#: en/help_topics/revisionspec.txt:172
13165
" Select the revision that merged the specified revision into mainline."
13168
#: en/help_topics/revisionspec.txt:174
13172
#: en/help_topics/revisionspec.txt:176
13174
" Supply a positive number to get the nth revision from the end.\n"
13175
" This is the same as supplying negative numbers to the 'revno:' spec.\n"
13179
#: en/help_topics/revisionspec.txt:180
13181
" last:1 -> return the last revision\n"
13182
" last:3 -> return the revision 2 before the end.\n"
13185
#: en/help_topics/rules.txt:1
13191
#: en/help_topics/rules.txt:7
13193
"Rules are defined in ini file format where the sections are file glob\n"
13194
"patterns and the contents of each section are the preferences for files\n"
13195
"matching that pattern(s). For example::"
13198
#: en/help_topics/rules.txt:11
13206
#: en/help_topics/rules.txt:14
13208
" [name *.html *.xml]\n"
13209
" keywords = xml_escape"
13211
" [name *.html *.xml]\n"
13212
" keywords = xml_escape"
13214
#: en/help_topics/rules.txt:17
13216
"Preferences like these are useful for commands and plugins wishing to\n"
13217
"provide custom behaviour for selected files. For more information on \n"
13218
"end of line conversion see :doc:`eol-help`.\n"
13219
"Keyword support is provided by the `keywords plugin\n"
13220
"<http://doc.bazaar.canonical.com/plugins/en/keywords-plugin.html>`_."
13223
#: en/help_topics/rules.txt:23
13229
#: en/help_topics/rules.txt:26
13231
"Default rules for all branches are defined in the optional file\n"
13232
"``BZR_HOME/rules``. "
13235
#: en/help_topics/rules.txt:29
13241
#: en/help_topics/rules.txt:32
13243
"Patterns are ordered and searching stops as soon as one matches.\n"
13244
"As a consequence, more explicit patterns should be placed towards\n"
13245
"the top of the file. Rule patterns use exactly the same conventions\n"
13246
"as ignore patterns. See :doc:`patterns-help` for details."
13249
#: en/help_topics/rules.txt:37
13253
#: en/help_topics/rules.txt:39
13255
" Patterns containing square brackets or spaces should be\n"
13256
" surrounded in quotes to ensure they are correctly parsed.\n"
13259
#: en/help_topics/topics.txt:1
13261
"authentication Information on configuring authentication\n"
13262
"basic Basic commands\n"
13263
"branches Information on what a branch is\n"
13264
"bugs Bug tracker settings\n"
13265
"checkouts Information on what a checkout is\n"
13266
"commands Basic help for all commands\n"
13267
"configuration Details on the configuration settings available\n"
13268
"conflict-types Types of conflicts and what to do about them\n"
13269
"content-filters Conversion of content into/from working trees\n"
13270
"criss-cross Information on criss-cross merging\n"
13271
"current-formats Current storage formats\n"
13272
"debug-flags Options to show or record debug information\n"
13273
"diverged-branches How to fix diverged branches\n"
13274
"env-variables Environment variable names and values\n"
13275
"eol Information on end-of-line handling\n"
13276
"files Information on configuration and log files\n"
13277
"formats Information on choosing a storage format\n"
13278
"global-options Options that control how Bazaar runs\n"
13279
"hidden-commands All hidden commands\n"
13280
"hooks Points at which custom processing can be added\n"
13281
"launchpad Using Bazaar with Launchpad.net\n"
13282
"location-alias Aliases for remembered locations\n"
13283
"log-formats Details on the logging formats available\n"
13284
"other-formats Experimental and deprecated storage formats\n"
13285
"patterns Information on the pattern syntax\n"
13286
"repositories Basic information on shared repositories.\n"
13287
"revisionspec Explain how to use --revision\n"
13288
"rules Information on defining rule-based preferences\n"
13289
"standalone-trees Information on what a standalone tree is\n"
13290
"standard-options Options that can be used with any command\n"
13291
"status-flags Help on status flags\n"
13292
"sync-for-reconfigure Steps to resolve \"out-of-sync\" when reconfiguring\n"
13293
"topics Topics list\n"
13294
"url-special-chars Special character handling in URLs\n"
13295
"urlspec Supported transport protocols\n"
13296
"working-trees Information on working trees\n"
13299
#: en/help_topics/url-special-chars.txt:1
13301
"Special character handling in URLs\n"
13302
"=================================="
13305
#: en/help_topics/url-special-chars.txt:4
13306
msgid "Bazaar allows locations to be specified in multiple ways, either:"
13309
#: en/help_topics/url-special-chars.txt:6
13310
msgid " * Fully qualified URLs"
13313
#: en/help_topics/url-special-chars.txt:8
13314
msgid " * File system paths, relative or absolute"
13317
#: en/help_topics/url-special-chars.txt:10
13319
"Internally bzr treats all locations as URLs. For any file system paths\n"
13320
"that are specified it will automatically determine the appropriate URL\n"
13321
"representation, and escape special characters where necessary."
13324
#: en/help_topics/url-special-chars.txt:14
13326
"There are a few characters which have special meaning in URLs and need "
13328
"handling to avoid ambiguities. Characters can be escaped with a % and a hex\n"
13329
"value in URLs. Any non-ASCII characters in a file path will automatically "
13331
"urlencoded when the path is converted to a URL."
13334
#: en/help_topics/url-special-chars.txt:19
13336
"URLs represent non-ASCII characters in an encoding defined by the server, "
13338
"usually UTF-8. The % escapes should be of the UTF-8 bytes. Bazaar tries to "
13340
"generous in what it accepts as a URL and to print them in a way that\n"
13341
"will be readable."
13344
#: en/help_topics/url-special-chars.txt:24
13346
"For example, if you have a directory named '/tmp/%2False' these are all "
13348
"ways of accessing the content (0x2F, or 47, is the ASCII code for forward "
13352
#: en/help_topics/url-special-chars.txt:27
13355
" bzr log /tmp/%2False\n"
13356
" bzr log %2False\n"
13357
" bzr log file:///tmp/%252False\n"
13358
" bzr log file://localhost/tmp/%252False\n"
13359
" bzr log file:%252False"
13362
" bzr log /tmp/%2False\n"
13363
" bzr log %2False\n"
13364
" bzr log file:///tmp/%252False\n"
13365
" bzr log file://localhost/tmp/%252False\n"
13366
" bzr log file:%252False"
13368
#: en/help_topics/url-special-chars.txt:34
13369
msgid "These are valid but do not refer to the same file::"
13372
#: en/help_topics/url-special-chars.txt:36
13374
" bzr log file:///tmp/%2False (refers to a file called /tmp/\\/alse)\n"
13375
" bzr log %252False (refers to a file called /tmp/%252False)"
13378
#: en/help_topics/url-special-chars.txt:39
13380
"Comma also has special meaning in URLs, because it denotes `segment "
13384
#: en/help_topics/url-special-chars.txt:41
13386
"_`segment parameters`: http://www.ietf.org/rfc/rfc3986.txt (section 3.3)"
13389
#: en/help_topics/url-special-chars.txt:43
13391
"Comma is also special in any file system paths that are specified. To use a "
13393
"comma in a file system path, specify a URL and URL encode the comma::"
13396
#: en/help_topics/url-special-chars.txt:46
13398
" bzr log foo,branch=bla # path \"foo\" with the segment parameter "
13399
"\"branch\" set to \"bla\"\n"
13400
" bzr log file:foo%2Cbranch=bla # path \"foo,branch=bla\"\n"
13401
" bzr log file:foo,branch=bla # path \"foo\" with segment parameter "
13402
"\"branch\" set to \"bla\"\n"
13405
#: en/help_topics/urlspec.txt:1
13406
msgid "URL Identifiers"
13409
#: en/help_topics/urlspec.txt:3
13410
msgid "Supported URL prefixes::"
13413
#: en/help_topics/urlspec.txt:5
13415
" aftp:// Access using active FTP.\n"
13416
" bzr:// Fast access using the Bazaar smart server.\n"
13417
" bzr+ssh:// Fast access using the Bazaar smart server over SSH.\n"
13418
" file:// Access using the standard filesystem (default)\n"
13419
" ftp:// Access using passive FTP.\n"
13420
" http:// Read-only access of branches exported on the web.\n"
13421
" https:// Read-only access of branches exported on the web using "
13423
" sftp:// Access using SFTP (most SSH servers provide SFTP)."
13426
#: en/help_topics/urlspec.txt:14
13427
msgid "Supported modifiers::"
13430
#: en/help_topics/urlspec.txt:16
13431
msgid " gio+ Access using any GIO supported protocols."
13434
#: en/help_topics/urlspec.txt:18
13435
msgid "Bazaar supports all of the standard parts within the URL::"
13438
#: en/help_topics/urlspec.txt:20
13439
msgid " <protocol>://[user[:password]@]host[:port]/[path]"
13440
msgstr " <protocol>://[user[:password]@]host[:port]/[path]"
13442
#: en/help_topics/urlspec.txt:22
13443
msgid "allowing URLs such as::"
13446
#: en/help_topics/urlspec.txt:24
13447
msgid " http://bzruser:BadPass@bzr.example.com:8080/bzr/trunk"
13448
msgstr " http://bzruser:BadPass@bzr.example.com:8080/bzr/trunk"
13450
#: en/help_topics/urlspec.txt:26
13452
"For bzr+ssh:// and sftp:// URLs, Bazaar also supports paths that begin\n"
13453
"with '~' as meaning that the rest of the path should be interpreted\n"
13454
"relative to the remote user's home directory. For example if the user\n"
13455
"``remote`` has a home directory of ``/home/remote`` on the server\n"
13456
"shell.example.com, then::"
13459
#: en/help_topics/urlspec.txt:32
13460
msgid " bzr+ssh://remote@shell.example.com/~/myproject/trunk"
13461
msgstr " bzr+ssh://remote@shell.example.com/~/myproject/trunk"
13463
#: en/help_topics/urlspec.txt:34
13464
msgid "would refer to ``/home/remote/myproject/trunk``."
13467
#: en/help_topics/urlspec.txt:36
13469
"Many commands that accept URLs also accept location aliases too.\n"
13470
"See :doc:`location-alias-help` and :doc:`url-special-chars-help`.\n"