1
# Uyghur 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: 2012-03-15 10:20+0100\n"
11
"PO-Revision-Date: 2012-02-17 08:02+0000\n"
12
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
13
"Language-Team: Uyghur <ug@li.org>\n"
15
"Content-Type: text/plain; charset=UTF-8\n"
16
"Content-Transfer-Encoding: 8bit\n"
17
"Plural-Forms: nplurals=1; plural=0;\n"
18
"X-Launchpad-Export-Date: 2012-03-16 04:33+0000\n"
19
"X-Generator: Launchpad (build 14951)\n"
22
msgid "skipping {0} (larger than {1} of {2} bytes)"
25
#: bzrlib/branch.py:854
29
#: bzrlib/branch.py:3121
31
msgid "Pushed up to revision %d."
34
#: bzrlib/branch.py:3123
36
msgid "%d tag updated."
37
msgid_plural "%d tags updated."
41
#: bzrlib/branch.py:3126
42
msgid "No new revisions or tags to push."
45
#: bzrlib/branch.py:3128
46
msgid "No new revisions to push."
49
#: bzrlib/branch.py:3148
50
msgid "checked branch {0} format {1}"
53
#: bzrlib/branch.py:3151
55
msgid "found error:%s"
56
msgstr "تېپىلغان خاتالىقلار: %s"
58
#: bzrlib/builtins.py:251 bzrlib/builtins.py:3026 bzrlib/workingtree.py:323
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:5197
188
msgid "You can only supply one of revision_id or --revision"
191
#: bzrlib/builtins.py:444 bzrlib/builtins.py:5199
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 bzrlib/builtins.py:5953
268
msgid "Tags can only be placed on a single revision, not on a range"
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:1180
511
msgid "Need working tree for --show-base."
514
#: bzrlib/builtins.py:1196
515
msgid "No pull location known or specified."
518
#: bzrlib/builtins.py:1202
520
msgid "Using saved parent location: %s\n"
523
#: bzrlib/builtins.py:1209 bzrlib/builtins.py:4406
524
msgid "Cannot use -r with merge directives or bundles"
527
#: bzrlib/builtins.py:1252
528
msgid "Update a mirror of this branch."
531
#: bzrlib/builtins.py:1254
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:1257
539
"Some smart servers or protocols *may* put the working tree in place in\n"
543
#: bzrlib/builtins.py:1260
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:1264
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:1267
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:1271
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:1276
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:1287 bzrlib/foreign.py:272
580
"Branch to push from, rather than the one containing the working directory."
583
#: bzrlib/builtins.py:1290
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:1295
591
"Create a stacked branch that references the public location of the parent "
595
#: bzrlib/builtins.py:1298
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:1303 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:1306
609
msgid "Don't populate the working tree, even for protocols that support it."
612
#: bzrlib/builtins.py:1350
613
msgid "Could not determine branch to refer to."
616
#: bzrlib/builtins.py:1359
619
"No push location known or specified. To push to the parent branch (at %s), "
620
"use 'bzr push :parent'."
623
#: bzrlib/builtins.py:1365 bzrlib/foreign.py:306
624
msgid "No push location known or specified."
627
#: bzrlib/builtins.py:1369
629
msgid "Using saved push location: %s"
632
#: bzrlib/builtins.py:1379
633
msgid "Create a new branch that is a copy of an existing branch."
636
#: bzrlib/builtins.py:1381
638
"If the TO_LOCATION is omitted, the last component of the FROM_LOCATION will\n"
639
"be used. In other words, \"branch ../foo/bar\" will attempt to create "
641
"If the FROM_LOCATION has no / or path separator embedded, the TO_LOCATION\n"
642
"is derived from the FROM_LOCATION by stripping a leading scheme or drive\n"
643
"identifier, if any. For example, \"branch lp:foo-bar\" will attempt to\n"
647
#: bzrlib/builtins.py:1388
649
"To retrieve the branch as of a particular revision, supply the --revision\n"
650
"parameter, as in \"branch foo/bar -r 5\"."
653
#: bzrlib/builtins.py:1391
654
msgid "The synonyms 'clone' and 'get' for this command are deprecated."
657
#: bzrlib/builtins.py:1401
658
msgid "Create a branch without a working-tree."
661
#: bzrlib/builtins.py:1403
662
msgid "Switch the checkout in the current directory to the new branch."
665
#: bzrlib/builtins.py:1406
667
"Create a stacked branch referring to the source branch. The new branch will "
668
"depend on the availability of the source branch for all operations."
671
#: bzrlib/builtins.py:1410
672
msgid "Do not use a shared repository, even if available."
675
#: bzrlib/builtins.py:1412
677
"By default branch will fail if the target directory exists, but does not "
678
"already have a control directory. This flag will allow branch to proceed."
681
#: bzrlib/builtins.py:1417
682
msgid "Bind new branch to from location."
685
#: bzrlib/builtins.py:1464
687
msgid "Target directory \"%s\" already exists."
690
#: bzrlib/builtins.py:1476
692
msgid "Parent of \"%s\" does not exist."
695
#: bzrlib/builtins.py:1495
696
msgid "The branch {0} has no revision {1}."
699
#: bzrlib/builtins.py:1510 bzrlib/push.py:53
701
msgid "Created new stacked branch referring to %s."
704
#: bzrlib/builtins.py:1514
706
msgid "Branched %d revision."
707
msgid_plural "Branched %d revisions."
711
#: bzrlib/builtins.py:1519
713
msgid "New branch bound to %s"
716
#: bzrlib/builtins.py:1524 bzrlib/builtins.py:6247
718
msgid "Switched to branch: %s"
721
#: bzrlib/builtins.py:1529
722
msgid "List the branches available at the current location."
725
#: bzrlib/builtins.py:1531
727
"This command will print the names of all the branches at the current\n"
731
#: bzrlib/builtins.py:1538
733
"Recursively scan for branches rather than just looking in the specified "
737
#: bzrlib/builtins.py:1567
741
#: bzrlib/builtins.py:1579
742
msgid "Create a new checkout of an existing branch."
745
#: bzrlib/builtins.py:1581
747
"If BRANCH_LOCATION is omitted, checkout will reconstitute a working tree "
749
"the branch found in '.'. This is useful if you have removed the working "
751
"or if it was never created - i.e. if you pushed the branch to its current\n"
752
"location using SFTP."
755
#: bzrlib/builtins.py:1586
757
"If the TO_LOCATION is omitted, the last component of the BRANCH_LOCATION "
759
"be used. In other words, \"checkout ../foo/bar\" will attempt to create "
761
"If the BRANCH_LOCATION has no / or path separator embedded, the TO_LOCATION\n"
762
"is derived from the BRANCH_LOCATION by stripping a leading scheme or drive\n"
763
"identifier, if any. For example, \"checkout lp:foo-bar\" will attempt to\n"
767
#: bzrlib/builtins.py:1593
769
"To retrieve the branch as of a particular revision, supply the --revision\n"
770
"parameter, as in \"checkout foo/bar -r 5\". Note that this will be "
772
"out of date [so you cannot commit] but it may be useful (i.e. to examine "
777
#: bzrlib/builtins.py:1603
779
"Perform a lightweight checkout. Lightweight checkouts depend on access to "
780
"the branch for every operation. Normal checkouts can perform common "
781
"operations like diff and status without such access, and also support local "
785
#: bzrlib/builtins.py:1610
786
msgid "Get file contents from this tree."
789
#: bzrlib/builtins.py:1612
790
msgid "Hard-link working tree files where possible."
793
#: bzrlib/builtins.py:1653
795
"Show list of renamed files.\n"
799
#: bzrlib/builtins.py:1681
800
msgid "Update a working tree to a new revision."
803
#: bzrlib/builtins.py:1683
805
"This will perform a merge of the destination revision (the tip of the\n"
806
"branch, or the specified revision) into the working tree, and then make\n"
807
"that revision the basis revision for the working tree. "
810
#: bzrlib/builtins.py:1687
812
"You can use this to visit an older revision, or to update a working tree\n"
813
"that is out of date from its branch."
816
#: bzrlib/builtins.py:1690
818
"If there are any uncommitted changes in the tree, they will be carried\n"
819
"across and remain as uncommitted changes after the update. To discard\n"
820
"these changes, use 'bzr revert'. The uncommitted changes may conflict\n"
821
"with the changes brought in by the change in basis revision."
824
#: bzrlib/builtins.py:1695
826
"If the tree's branch is bound to a master branch, bzr will also update\n"
827
"the branch from the master."
830
#: bzrlib/builtins.py:1698
832
"You cannot update just a single file or directory, because each Bazaar\n"
833
"working tree has just a single basis revision. If you want to restore a\n"
834
"file that has been removed locally, use 'bzr revert' instead of 'bzr\n"
835
"update'. If you want to restore a file to its state in a previous\n"
836
"revision, use 'bzr revert' with a '-r' option, or use 'bzr cat' to write\n"
837
"out the old content of that file to a new location."
840
#: bzrlib/builtins.py:1705
842
"The 'dir' argument, if given, must be the location of the root of a\n"
843
"working tree to update. By default, the working tree that contains the \n"
844
"current working directory is used."
847
#: bzrlib/builtins.py:1721
848
msgid "bzr update --revision takes exactly one revision"
851
#: bzrlib/builtins.py:1729
852
msgid "bzr update can only update a whole tree, not a file or subdirectory"
855
#: bzrlib/builtins.py:1760
856
msgid "Tree is up to date at revision {0} of branch {1}"
859
#: bzrlib/builtins.py:1776
862
"branch has no revision %s\n"
863
"bzr update --revision only works for a revision in the branch history"
866
#: bzrlib/builtins.py:1782
867
msgid "Updated to revision {0} of branch {1}"
870
#: bzrlib/builtins.py:1786
872
"Your local commits will now show as pending merges with 'bzr status', and "
873
"can be committed with 'bzr commit'."
876
#: bzrlib/builtins.py:1795
877
msgid "Show information about a working tree, branch or repository."
880
#: bzrlib/builtins.py:1797
882
"This command will show all known locations and formats associated to the\n"
883
"tree, branch or repository."
886
#: bzrlib/builtins.py:1800
888
"In verbose mode, statistical information is included with each report.\n"
889
"To see extended statistic information, use a verbosity level of 2 or\n"
890
"higher by specifying the verbose option multiple times, e.g. -vv."
893
#: bzrlib/builtins.py:1804
894
msgid "Branches and working trees will also report any missing revisions."
897
#: bzrlib/builtins.py:1806 bzrlib/builtins.py:3725 bzrlib/builtins.py:4859
898
#: bzrlib/builtins.py:6433
902
#: bzrlib/builtins.py:1808
903
msgid " Display information on the format and related locations:"
906
#: bzrlib/builtins.py:1810
910
#: bzrlib/builtins.py:1812
912
" Display the above together with extended format information and\n"
913
" basic statistics (like the number of files in the working tree and\n"
914
" number of revisions in the branch and repository):"
917
#: bzrlib/builtins.py:1816
921
#: bzrlib/builtins.py:1818
922
msgid " Display the above together with number of committers to the branch:"
925
#: bzrlib/builtins.py:1820
926
msgid " bzr info -vv"
929
#: bzrlib/builtins.py:1839
930
msgid "Remove files or directories."
933
#: bzrlib/builtins.py:1841
935
"This makes Bazaar stop tracking changes to the specified files. Bazaar will\n"
936
"delete them if they can easily be recovered using revert otherwise they\n"
937
"will be backed up (adding an extention of the form .~#~). If no options or\n"
938
"parameters are given Bazaar will scan for files that are being tracked by\n"
939
"Bazaar but missing in your tree and stop tracking them for you."
942
#: bzrlib/builtins.py:1849
943
msgid "Only remove files that have never been committed."
946
#: bzrlib/builtins.py:1851
947
msgid "The file deletion mode to be used."
950
#: bzrlib/builtins.py:1852
951
msgid "Deletion Strategy"
954
#: bzrlib/builtins.py:1853
955
msgid "Backup changed files (default)."
958
#: bzrlib/builtins.py:1854
959
msgid "Delete from bzr but leave the working copy."
962
#: bzrlib/builtins.py:1855
963
msgid "Don't backup changed files."
966
#: bzrlib/builtins.py:1856
968
"Delete all the specified files, even if they can not be recovered and even "
969
"if they are non-empty directories. (deprecated, use no-backup)"
972
#: bzrlib/builtins.py:1865
973
msgid "(The --force option is deprecated, rather use --no-backup in future.)"
976
#: bzrlib/builtins.py:1882
977
msgid "No matching files."
980
#: bzrlib/builtins.py:1943
981
msgid "Reconcile bzr metadata in a branch."
984
#: bzrlib/builtins.py:1945
986
"This can correct data mismatches that may have been caused by\n"
987
"previous ghost operations or bzr upgrades. You should only\n"
988
"need to run this command if 'bzr check' or a bzr developer\n"
989
"advises you to run it."
992
#: bzrlib/builtins.py:1950
994
"If a second branch is provided, cross-branch reconciliation is\n"
995
"also attempted, which will check that data like the tree root\n"
996
"id which was not present in very early bzr versions is represented\n"
997
"correctly in both branches."
1000
#: bzrlib/builtins.py:1955
1002
"At the same time it is run it may recompress data resulting in\n"
1003
"a potential saving in disk space or performance gain."
1006
#: bzrlib/builtins.py:1958
1007
msgid "The branch *MUST* be on a listable system such as local disk or sftp."
1010
#: bzrlib/builtins.py:2025 bzrlib/builtins.py:2143 bzrlib/builtins.py:3760
1012
"Format for the bzr 2.0 series.\n"
1013
"Uses group-compress storage.\n"
1014
"Provides rich roots which are a one-way transition.\n"
1017
#: bzrlib/builtins.py:2025 bzrlib/builtins.py:2143 bzrlib/builtins.py:3760
1019
"Pack-based format used in 1.x series. Introduced in 0.92. Interoperates with "
1020
"bzr repositories before 0.92 but cannot be read by bzr < 0.92. "
1023
#: bzrlib/builtins.py:2025 bzrlib/builtins.py:2143 bzrlib/builtins.py:3760
1024
msgid "The 2a format with experimental support for colocated branches.\n"
1027
#: bzrlib/builtins.py:2026
1028
msgid "Make a directory into a versioned branch."
1031
#: bzrlib/builtins.py:2028
1033
"Use this to create an empty branch, or before importing an\n"
1037
#: bzrlib/builtins.py:2031
1039
"If there is a repository in a parent directory of the location, then\n"
1040
"the history of the branch will be stored in the repository. Otherwise\n"
1041
"init creates a standalone branch which carries its own history\n"
1042
"in the .bzr directory."
1045
#: bzrlib/builtins.py:2036
1047
"If there is already a branch at the location but it has no working tree,\n"
1048
"the tree can be populated with 'bzr checkout'."
1051
#: bzrlib/builtins.py:2039
1052
msgid "Recipe for importing a tree of files::"
1055
#: bzrlib/builtins.py:2041
1061
" bzr commit -m \"imported project\""
1064
#: bzrlib/builtins.py:2052
1066
"Create the path leading up to the branch if it does not already exist."
1069
#: bzrlib/builtins.py:2055
1070
msgid "Specify a format for this branch. See \"help formats\"."
1073
#: bzrlib/builtins.py:2063
1075
"Never change revnos or the existing log. Append revisions to it only."
1078
#: bzrlib/builtins.py:2066
1079
msgid "Create a branch without a working tree."
1082
#: bzrlib/builtins.py:2086 bzrlib/push.py:110
1085
"Parent directory of %s does not exist.\n"
1086
"You may supply --create-prefix to create all leading parent directories."
1089
#: bzrlib/builtins.py:2120
1091
"This branch format cannot be set to append-revisions-only. Try --default."
1094
#: bzrlib/builtins.py:2131
1095
msgid "Created a {0} (format: {1})\n"
1098
#: bzrlib/builtins.py:2140
1100
msgid "Using shared repository: %s\n"
1103
#: bzrlib/builtins.py:2144
1104
msgid "Create a shared repository for branches to share storage space."
1107
#: bzrlib/builtins.py:2146
1109
"New branches created under the repository directory will store their\n"
1110
"revisions in the repository, not in the branch directory. For branches\n"
1111
"with shared history, this reduces the amount of storage needed and \n"
1112
"speeds up the creation of new branches."
1115
#: bzrlib/builtins.py:2151
1117
"If the --no-trees option is given then the branches in the repository\n"
1118
"will not have working trees by default. They will still exist as \n"
1119
"directories on disk, but they will not have separate copies of the \n"
1120
"files at a certain revision. This can be useful for repositories that\n"
1121
"store branches which are interacted with through checkouts or remote\n"
1122
"branches, such as on a server."
1125
#: bzrlib/builtins.py:2158
1128
" Create a shared repository holding just branches::"
1131
#: bzrlib/builtins.py:2161
1133
" bzr init-repo --no-trees repo\n"
1134
" bzr init repo/trunk"
1137
#: bzrlib/builtins.py:2164
1138
msgid " Make a lightweight checkout elsewhere::"
1141
#: bzrlib/builtins.py:2166
1143
" bzr checkout --lightweight repo/trunk trunk-checkout\n"
1144
" cd trunk-checkout\n"
1148
#: bzrlib/builtins.py:2174
1150
"Specify a format for this repository. See \"bzr help formats\" for details."
1153
#: bzrlib/builtins.py:2178
1154
msgid "Repository format"
1157
#: bzrlib/builtins.py:2180
1158
msgid "Branches in the repository will default to not having a working tree."
1161
#: bzrlib/builtins.py:2206
1162
msgid "Show differences in the working tree, between revisions or branches."
1165
#: bzrlib/builtins.py:2208
1167
"If no arguments are given, all changes for the current tree are listed.\n"
1168
"If files are given, only the changes in those files are listed.\n"
1169
"Remote and multiple branches can be compared by using the --old and\n"
1170
"--new options. If not provided, the default for both is derived from\n"
1171
"the first argument, if any, or the current tree if no arguments are\n"
1175
#: bzrlib/builtins.py:2215
1177
"\"bzr diff -p1\" is equivalent to \"bzr diff --prefix old/:new/\", and\n"
1178
"produces patches suitable for \"patch -p1\"."
1181
#: bzrlib/builtins.py:2218
1183
"Note that when using the -r argument with a range of revisions, the\n"
1184
"differences are computed between the two specified revisions. That\n"
1185
"is, the command does not show the changes introduced by the first \n"
1186
"revision in the range. This differs from the interpretation of \n"
1187
"revision ranges used by \"bzr log\" which includes the first revision\n"
1191
#: bzrlib/builtins.py:2225
1195
" 2 - unrepresentable changes\n"
1200
#: bzrlib/builtins.py:2231
1203
" Shows the difference in the working tree versus the last commit::"
1206
#: bzrlib/builtins.py:2234
1210
#: bzrlib/builtins.py:2236
1211
msgid " Difference between the working tree and revision 1::"
1214
#: bzrlib/builtins.py:2238
1215
msgid " bzr diff -r1"
1218
#: bzrlib/builtins.py:2240
1219
msgid " Difference between revision 3 and revision 1::"
1222
#: bzrlib/builtins.py:2242
1223
msgid " bzr diff -r1..3"
1226
#: bzrlib/builtins.py:2244
1227
msgid " Difference between revision 3 and revision 1 for branch xxx::"
1230
#: bzrlib/builtins.py:2246
1231
msgid " bzr diff -r1..3 xxx"
1234
#: bzrlib/builtins.py:2248
1235
msgid " The changes introduced by revision 2 (equivalent to -r1..2)::"
1238
#: bzrlib/builtins.py:2250
1239
msgid " bzr diff -c2"
1242
#: bzrlib/builtins.py:2252
1244
" To see the changes introduced by revision X::\n"
1249
#: bzrlib/builtins.py:2256
1251
" Note that in the case of a merge, the -c option shows the changes\n"
1252
" compared to the left hand parent. To see the changes against\n"
1253
" another parent, use::"
1256
#: bzrlib/builtins.py:2260
1257
msgid " bzr diff -r<chosen_parent>..X"
1260
#: bzrlib/builtins.py:2262
1262
" The changes between the current revision and the previous revision\n"
1263
" (equivalent to -c-1 and -r-2..-1)"
1266
#: bzrlib/builtins.py:2265
1267
msgid " bzr diff -r-2.."
1270
#: bzrlib/builtins.py:2267
1271
msgid " Show just the differences for file NEWS::"
1274
#: bzrlib/builtins.py:2269
1275
msgid " bzr diff NEWS"
1278
#: bzrlib/builtins.py:2271
1279
msgid " Show the differences in working tree xxx for file NEWS::"
1282
#: bzrlib/builtins.py:2273
1283
msgid " bzr diff xxx/NEWS"
1286
#: bzrlib/builtins.py:2275
1287
msgid " Show the differences from branch xxx to this working tree:"
1290
#: bzrlib/builtins.py:2277
1291
msgid " bzr diff --old xxx"
1294
#: bzrlib/builtins.py:2279
1295
msgid " Show the differences between two branches for file NEWS::"
1298
#: bzrlib/builtins.py:2281
1299
msgid " bzr diff --old xxx --new yyy NEWS"
1302
#: bzrlib/builtins.py:2283
1303
msgid " Same as 'bzr diff' but prefix paths with old/ and new/::"
1306
#: bzrlib/builtins.py:2285
1308
" bzr diff --prefix old/:new/\n"
1310
" Show the differences using a custom diff program with options::\n"
1312
" bzr diff --using /usr/bin/diff --diff-options -wu"
1315
#: bzrlib/builtins.py:2295
1316
msgid "Pass these options to the external diff program."
1319
#: bzrlib/builtins.py:2298
1321
"Set prefixes added to old and new filenames, as two values separated by a "
1322
"colon. (eg \"old/:new/\")."
1325
#: bzrlib/builtins.py:2301
1326
msgid "Branch/tree to compare from."
1329
#: bzrlib/builtins.py:2305
1330
msgid "Branch/tree to compare to."
1333
#: bzrlib/builtins.py:2311
1334
msgid "Use this command to compare files."
1337
#: bzrlib/builtins.py:2316
1338
msgid "Diff format to use."
1341
#: bzrlib/builtins.py:2318
1345
#: bzrlib/builtins.py:2340
1346
msgid "--prefix expects two values separated by a colon (eg \"old/:new/\")"
1349
#: bzrlib/builtins.py:2344
1350
msgid "bzr diff --revision takes exactly one or two revision specifiers"
1353
#: bzrlib/builtins.py:2349 bzrlib/builtins.py:2746 bzrlib/builtins.py:2759
1354
#: bzrlib/builtins.py:2767 bzrlib/builtins.py:4933
1355
msgid "{0} and {1} are mutually exclusive"
1358
#: bzrlib/builtins.py:2369
1360
"List files deleted in the working tree.\n"
1364
#: bzrlib/builtins.py:2446
1365
msgid "Show the tree root directory."
1368
#: bzrlib/builtins.py:2448
1370
"The root is the nearest enclosing directory with a .bzr control\n"
1374
#: bzrlib/builtins.py:2463
1375
msgid "The limit argument must be an integer."
1378
#: bzrlib/builtins.py:2471
1379
msgid "The levels argument must be an integer."
1382
#: bzrlib/builtins.py:2476
1383
msgid "Show historical log for a branch or subset of a branch."
1386
#: bzrlib/builtins.py:2478
1388
"log is bzr's default tool for exploring the history of a branch.\n"
1389
"The branch to use is taken from the first parameter. If no parameters\n"
1390
"are given, the branch containing the working directory is logged.\n"
1391
"Here are some simple examples::"
1394
#: bzrlib/builtins.py:2483
1396
" bzr log log the current branch\n"
1397
" bzr log foo.py log a file in its branch\n"
1398
" bzr log http://server/branch log a branch on a server"
1401
#: bzrlib/builtins.py:2487
1403
"The filtering, ordering and information shown for each revision can\n"
1404
"be controlled as explained below. By default, all revisions are\n"
1405
"shown sorted (topologically) so that newer revisions appear before\n"
1406
"older ones and descendants always appear before ancestors. If displayed,\n"
1407
"merged revisions are shown indented under the revision in which they\n"
1411
#: bzrlib/builtins.py:2494
1412
msgid ":Output control:"
1415
#: bzrlib/builtins.py:2496
1417
" The log format controls how information about each revision is\n"
1418
" displayed. The standard log formats are called ``long``, ``short``\n"
1419
" and ``line``. The default is long. See ``bzr help log-formats``\n"
1420
" for more details on log formats."
1423
#: bzrlib/builtins.py:2501
1425
" The following options can be used to control what information is\n"
1429
#: bzrlib/builtins.py:2504
1431
" -l N display a maximum of N revisions\n"
1432
" -n N display N levels of revisions (0 for all, 1 for collapsed)\n"
1433
" -v display a status summary (delta) for each revision\n"
1434
" -p display a diff (patch) for each revision\n"
1435
" --show-ids display revision-ids (and file-ids), not just revnos"
1438
#: bzrlib/builtins.py:2510
1440
" Note that the default number of levels to display is a function of the\n"
1441
" log format. If the -n option is not used, the standard log formats show\n"
1442
" just the top level (mainline)."
1445
#: bzrlib/builtins.py:2514
1447
" Status summaries are shown using status flags like A, M, etc. To see\n"
1448
" the changes explained using words like ``added`` and ``modified``\n"
1449
" instead, use the -vv option."
1452
#: bzrlib/builtins.py:2518
1453
msgid ":Ordering control:"
1456
#: bzrlib/builtins.py:2520
1458
" To display revisions from oldest to newest, use the --forward option.\n"
1459
" In most cases, using this option will have little impact on the total\n"
1460
" time taken to produce a log, though --forward does not incrementally\n"
1461
" display revisions like --reverse does when it can."
1464
#: bzrlib/builtins.py:2525
1465
msgid ":Revision filtering:"
1468
#: bzrlib/builtins.py:2527
1470
" The -r option can be used to specify what revision or range of revisions\n"
1471
" to filter against. The various forms are shown below::"
1474
#: bzrlib/builtins.py:2530
1476
" -rX display revision X\n"
1477
" -rX.. display revision X and later\n"
1478
" -r..Y display up to and including revision Y\n"
1479
" -rX..Y display from X to Y inclusive"
1482
#: bzrlib/builtins.py:2535
1484
" See ``bzr help revisionspec`` for details on how to specify X and Y.\n"
1485
" Some common examples are given below::"
1488
#: bzrlib/builtins.py:2538
1490
" -r-1 show just the tip\n"
1491
" -r-10.. show the last 10 mainline revisions\n"
1492
" -rsubmit:.. show what's new on this branch\n"
1493
" -rancestor:path.. show changes since the common ancestor of this\n"
1494
" branch and the one at location path\n"
1495
" -rdate:yesterday.. show changes since yesterday"
1498
#: bzrlib/builtins.py:2545
1500
" When logging a range of revisions using -rX..Y, log starts at\n"
1501
" revision Y and searches back in history through the primary\n"
1502
" (\"left-hand\") parents until it finds X. When logging just the\n"
1503
" top level (using -n1), an error is reported if X is not found\n"
1504
" along the way. If multi-level logging is used (-n0), X may be\n"
1505
" a nested merge revision and the log will be truncated accordingly."
1508
#: bzrlib/builtins.py:2552
1509
msgid ":Path filtering:"
1512
#: bzrlib/builtins.py:2554
1514
" If parameters are given and the first one is not a branch, the log\n"
1515
" will be filtered to show only those revisions that changed the\n"
1516
" nominated files or directories."
1519
#: bzrlib/builtins.py:2558
1521
" Filenames are interpreted within their historical context. To log a\n"
1522
" deleted file, specify a revision range so that the file existed at\n"
1523
" the end or start of the range."
1526
#: bzrlib/builtins.py:2562
1528
" Historical context is also important when interpreting pathnames of\n"
1529
" renamed files/directories. Consider the following example:"
1532
#: bzrlib/builtins.py:2565
1534
" * revision 1: add tutorial.txt\n"
1535
" * revision 2: modify tutorial.txt\n"
1536
" * revision 3: rename tutorial.txt to guide.txt; add tutorial.txt"
1539
#: bzrlib/builtins.py:2569
1540
msgid " In this case:"
1543
#: bzrlib/builtins.py:2571
1544
msgid " * ``bzr log guide.txt`` will log the file added in revision 1"
1547
#: bzrlib/builtins.py:2573
1549
" * ``bzr log tutorial.txt`` will log the new file added in revision 3"
1552
#: bzrlib/builtins.py:2575
1554
" * ``bzr log -r2 -p tutorial.txt`` will show the changes made to\n"
1555
" the original file in revision 2."
1558
#: bzrlib/builtins.py:2578
1560
" * ``bzr log -r2 -p guide.txt`` will display an error message as there\n"
1561
" was no file called guide.txt in revision 2."
1564
#: bzrlib/builtins.py:2581
1566
" Renames are always followed by log. By design, there is no need to\n"
1567
" explicitly ask for this (and no way to stop logging a file back\n"
1568
" until it was last renamed)."
1571
#: bzrlib/builtins.py:2585
1572
msgid ":Other filtering:"
1575
#: bzrlib/builtins.py:2587
1577
" The --match option can be used for finding revisions that match a\n"
1578
" regular expression in a commit message, committer, author or bug.\n"
1579
" Specifying the option several times will match any of the supplied\n"
1580
" expressions. --match-author, --match-bugs, --match-committer and\n"
1581
" --match-message can be used to only match a specific field."
1584
#: bzrlib/builtins.py:2593
1585
msgid ":Tips & tricks:"
1588
#: bzrlib/builtins.py:2595
1590
" GUI tools and IDEs are often better at exploring history than command\n"
1591
" line tools: you may prefer qlog or viz from qbzr or bzr-gtk, the\n"
1592
" bzr-explorer shell, or the Loggerhead web interface. See the Plugin\n"
1593
" Guide <http://doc.bazaar.canonical.com/plugins/en/> and\n"
1594
" <http://wiki.bazaar.canonical.com/IDEIntegration>. "
1597
#: bzrlib/builtins.py:2601
1599
" You may find it useful to add the aliases below to ``bazaar.conf``::"
1602
#: bzrlib/builtins.py:2603
1606
" top = log -l10 --line\n"
1610
#: bzrlib/builtins.py:2608
1612
" ``bzr tip`` will then show the latest revision while ``bzr top``\n"
1613
" will show the last 10 mainline revisions. To see the details of a\n"
1614
" particular revision X, ``bzr show -rX``."
1617
#: bzrlib/builtins.py:2612
1619
" If you are interested in looking deeper into a particular merge X,\n"
1620
" use ``bzr log -n0 -rX``."
1623
#: bzrlib/builtins.py:2615
1625
" ``bzr log -v`` on a branch with lots of history is currently\n"
1626
" very slow. A fix for this issue is currently under development.\n"
1627
" With or without that fix, it is recommended that a revision range\n"
1628
" be given when using the -v option."
1631
#: bzrlib/builtins.py:2620
1633
" bzr has a generic full-text matching plugin, bzr-search, that can be\n"
1634
" used to find revisions matching user names, commit messages, etc.\n"
1635
" Among other features, this plugin can find all revisions containing\n"
1636
" a list of words but not others."
1639
#: bzrlib/builtins.py:2625
1641
" When exploring non-mainline history on large projects with deep\n"
1642
" history, the performance of log can be greatly improved by installing\n"
1643
" the historycache plugin. This plugin buffers historical information\n"
1644
" trading disk space for faster speed."
1647
#: bzrlib/builtins.py:2634
1648
msgid "Show from oldest to newest."
1651
#: bzrlib/builtins.py:2637
1652
msgid "Show files changed in each revision."
1655
#: bzrlib/builtins.py:2643
1656
msgid "Show just the specified revision. See also \"help revisionspec\"."
1659
#: bzrlib/builtins.py:2647
1660
msgid "What names to list as authors - first, all or committer."
1663
#: bzrlib/builtins.py:2648
1667
#: bzrlib/builtins.py:2653
1668
msgid "Number of levels to display - 0 for all, 1 for flat."
1671
#: bzrlib/builtins.py:2663
1672
msgid "Limit the output to the first N revisions."
1675
#: bzrlib/builtins.py:2668
1676
msgid "Show changes made in each revision as a patch."
1679
#: bzrlib/builtins.py:2670
1680
msgid "Show merged revisions like --levels 0 does."
1683
#: bzrlib/builtins.py:2674
1684
msgid "Do not report commits with more than one parent."
1687
#: bzrlib/builtins.py:2676
1689
"Display only the revisions that are not part of both ancestries (require -"
1693
#: bzrlib/builtins.py:2680
1694
msgid "Show digital signature validity."
1697
#: bzrlib/builtins.py:2683
1698
msgid "Show revisions whose properties match this expression."
1701
#: bzrlib/builtins.py:2687
1702
msgid "Show revisions whose message matches this expression."
1705
#: bzrlib/builtins.py:2691
1706
msgid "Show revisions whose committer matches this expression."
1709
#: bzrlib/builtins.py:2695
1710
msgid "Show revisions whose authors match this expression."
1713
#: bzrlib/builtins.py:2699
1714
msgid "Show revisions whose bugs match this expression."
1717
#: bzrlib/builtins.py:2753
1718
msgid "--exclude-common-ancestry requires -r with two revisions"
1721
#: bzrlib/builtins.py:2781
1723
msgid "Path unknown at end or start of revision range: %s"
1726
#: bzrlib/builtins.py:2898
1728
msgid "bzr %s doesn't accept two revisions in different branches."
1731
#: bzrlib/builtins.py:2914
1733
msgid "bzr %s --revision takes one or two values."
1736
#: bzrlib/builtins.py:2959
1738
"List files in a tree.\n"
1742
#: bzrlib/builtins.py:2968
1743
msgid "Recurse into subdirectories."
1746
#: bzrlib/builtins.py:2970
1747
msgid "Print paths relative to the root of the branch."
1750
#: bzrlib/builtins.py:2972
1751
msgid "Print unknown files."
1754
#: bzrlib/builtins.py:2973
1755
msgid "Print versioned files."
1758
#: bzrlib/builtins.py:2976
1759
msgid "Print ignored files."
1762
#: bzrlib/builtins.py:2978
1763
msgid "List entries of a particular kind: file, directory, symlink."
1766
#: bzrlib/builtins.py:2991
1767
msgid "invalid kind specified"
1770
#: bzrlib/builtins.py:2994
1771
msgid "Cannot set both --verbose and --null"
1774
#: bzrlib/builtins.py:3003
1775
msgid "cannot specify both --from-root and PATH"
1778
#: bzrlib/builtins.py:3090
1779
msgid "Ignore specified files or patterns."
1782
#: bzrlib/builtins.py:3092
1783
msgid "See ``bzr help patterns`` for details on the syntax of patterns."
1786
#: bzrlib/builtins.py:3094
1788
"If a .bzrignore file does not exist, the ignore command\n"
1789
"will create one and add the specified files or patterns to the newly\n"
1790
"created file. The ignore command will also automatically add the \n"
1791
".bzrignore file to be versioned. Creating a .bzrignore file without\n"
1792
"the use of the ignore command will require an explicit add command."
1795
#: bzrlib/builtins.py:3100
1797
"To remove patterns from the ignore list, edit the .bzrignore file.\n"
1798
"After adding, editing or deleting that file either indirectly by\n"
1799
"using this command or directly by using an editor, be sure to commit\n"
1803
#: bzrlib/builtins.py:3105
1805
"Bazaar also supports a global ignore file ~/.bazaar/ignore. On Windows\n"
1806
"the global ignore file can be found in the application data directory as\n"
1807
"C:\\Documents and Settings\\<user>\\Application Data\\Bazaar\\2.0\\ignore.\n"
1808
"Global ignores are not touched by this command. The global ignore file\n"
1809
"can be edited directly using an editor."
1812
#: bzrlib/builtins.py:3111
1814
"Patterns prefixed with '!' are exceptions to ignore patterns and take\n"
1815
"precedence over regular ignores. Such exceptions are used to specify\n"
1816
"files that should be versioned which would otherwise be ignored."
1819
#: bzrlib/builtins.py:3115
1821
"Patterns prefixed with '!!' act as regular ignore patterns, but have\n"
1822
"precedence over the '!' exception patterns."
1825
#: bzrlib/builtins.py:3118
1829
"* Ignore patterns containing shell wildcards must be quoted from\n"
1830
" the shell on Unix."
1833
#: bzrlib/builtins.py:3123
1835
"* Ignore patterns starting with \"#\" act as comments in the ignore file.\n"
1836
" To ignore patterns that begin with that character, use the \"RE:\" prefix."
1839
#: bzrlib/builtins.py:3126
1842
" Ignore the top level Makefile::"
1845
#: bzrlib/builtins.py:3129
1846
msgid " bzr ignore ./Makefile"
1849
#: bzrlib/builtins.py:3131
1850
msgid " Ignore .class files in all directories...::"
1853
#: bzrlib/builtins.py:3133
1854
msgid " bzr ignore \"*.class\""
1857
#: bzrlib/builtins.py:3135
1858
msgid " ...but do not ignore \"special.class\"::"
1861
#: bzrlib/builtins.py:3137
1862
msgid " bzr ignore \"!special.class\""
1865
#: bzrlib/builtins.py:3139
1866
msgid " Ignore files whose name begins with the \"#\" character::"
1869
#: bzrlib/builtins.py:3141
1870
msgid " bzr ignore \"RE:^#\""
1873
#: bzrlib/builtins.py:3143 bzrlib/builtins.py:3147
1874
msgid " Ignore .o files under the lib directory::"
1877
#: bzrlib/builtins.py:3145
1878
msgid " bzr ignore \"lib/**/*.o\""
1881
#: bzrlib/builtins.py:3149
1882
msgid " bzr ignore \"RE:lib/.*\\.o\""
1885
#: bzrlib/builtins.py:3151
1886
msgid " Ignore everything but the \"debian\" toplevel directory::"
1889
#: bzrlib/builtins.py:3153
1891
" bzr ignore \"RE:(?!debian/).*\"\n"
1893
" Ignore everything except the \"local\" toplevel directory,\n"
1894
" but always ignore autosave files ending in ~, even under local/::\n"
1896
" bzr ignore \"*\"\n"
1897
" bzr ignore \"!./local\"\n"
1898
" bzr ignore \"!!*~\""
1901
#: bzrlib/builtins.py:3167
1902
msgid "Display the default ignore rules that bzr uses."
1905
#: bzrlib/builtins.py:3179
1906
msgid "ignore requires at least one NAME_PATTERN or --default-rules."
1909
#: bzrlib/builtins.py:3190
1911
msgid "Invalid ignore pattern found. %s"
1912
msgid_plural "Invalid ignore patterns found. %s"
1916
#: bzrlib/builtins.py:3199
1917
msgid "NAME_PATTERN should not be an absolute path"
1920
#: bzrlib/builtins.py:3212
1923
"Warning: the following files are version controlled and match your ignore "
1926
"These files will continue to be version controlled unless you 'bzr remove' "
1930
#: bzrlib/builtins.py:3219
1931
msgid "List ignored files and the patterns that matched them."
1934
#: bzrlib/builtins.py:3221
1936
"List all the ignored files and the ignore pattern that caused the file to\n"
1940
#: bzrlib/builtins.py:3224
1941
msgid "Alternatively, to list just the files::"
1944
#: bzrlib/builtins.py:3226
1945
msgid " bzr ls --ignored"
1948
#: bzrlib/builtins.py:3260
1950
msgid "not a valid revision-number: %r"
1953
#: bzrlib/builtins.py:3267
1955
"Export current or past revision to a destination directory or archive."
1958
#: bzrlib/builtins.py:3269
1959
msgid "If no revision is specified this exports the last committed revision."
1962
#: bzrlib/builtins.py:3271
1964
"Format may be an \"exporter\" name, such as tar, tgz, tbz2. If none is\n"
1965
"given, try to find the format with the extension. If no extension\n"
1966
"is found exports to a directory (equivalent to --format=dir)."
1969
#: bzrlib/builtins.py:3275
1971
"If root is supplied, it will be used as the root directory inside\n"
1972
"container formats (tar, zip, etc). If it is not supplied it will default\n"
1973
"to the exported filename. The root option has no effect for 'dir' format."
1976
#: bzrlib/builtins.py:3279
1978
"If branch is omitted then the branch containing the current working\n"
1979
"directory will be used."
1982
#: bzrlib/builtins.py:3282
1984
"Note: Export of tree with non-ASCII filenames to zip is not supported."
1987
#: bzrlib/builtins.py:3284
1989
" ================= =========================\n"
1990
" Supported formats Autodetected by extension\n"
1991
" ================= =========================\n"
1994
" tbz2 .tar.bz2, .tbz2\n"
1995
" tgz .tar.gz, .tgz\n"
1997
" ================= ========================="
2000
#: bzrlib/builtins.py:3298
2001
msgid "Type of file to export to."
2004
#: bzrlib/builtins.py:3301
2005
msgid "Apply content filters to export the convenient form."
2008
#: bzrlib/builtins.py:3305
2009
msgid "Name of the root directory inside the exported file."
2012
#: bzrlib/builtins.py:3307
2014
"Set modification time of files to that of the last revision in which it was "
2018
#: bzrlib/builtins.py:3310
2020
"Export the working tree contents rather than that of the last revision."
2023
#: bzrlib/builtins.py:3329
2024
msgid "--uncommitted requires a working tree"
2027
#: bzrlib/builtins.py:3338
2029
msgid "Unsupported export format: %s"
2032
#: bzrlib/builtins.py:3342
2034
"Write the contents of a file as of a given revision to standard output."
2037
#: bzrlib/builtins.py:3344
2038
msgid "If no revision is nominated, the last revision is used."
2041
#: bzrlib/builtins.py:3346
2043
"Note: Take care to redirect standard output when using this command on a\n"
2047
#: bzrlib/builtins.py:3352
2048
msgid "The path name in the old tree."
2051
#: bzrlib/builtins.py:3353
2052
msgid "Apply content filters to display the convenience form."
2055
#: bzrlib/builtins.py:3364
2056
msgid "bzr cat --revision takes exactly one revision specifier"
2059
#: bzrlib/builtins.py:3389 bzrlib/builtins.py:3401
2060
msgid "{0!r} is not present in revision {1}"
2063
#: bzrlib/builtins.py:3424
2064
msgid "Commit changes into a new revision."
2067
#: bzrlib/builtins.py:3426
2069
"An explanatory message needs to be given for each commit. This is\n"
2070
"often done by using the --message option (getting the message from the\n"
2071
"command line) or by using the --file option (getting the message from\n"
2072
"a file). If neither of these options is given, an editor is opened for\n"
2073
"the user to enter the message. To see the changed files in the\n"
2074
"boilerplate text loaded into the editor, use the --show-diff option."
2077
#: bzrlib/builtins.py:3433
2079
"By default, the entire tree is committed and the person doing the\n"
2080
"commit is assumed to be the author. These defaults can be overridden\n"
2081
"as explained below."
2084
#: bzrlib/builtins.py:3437
2085
msgid ":Selective commits:"
2088
#: bzrlib/builtins.py:3439
2090
" If selected files are specified, only changes to those files are\n"
2091
" committed. If a directory is specified then the directory and\n"
2092
" everything within it is committed."
2095
#: bzrlib/builtins.py:3443
2097
" When excludes are given, they take precedence over selected files.\n"
2098
" For example, to commit only changes within foo, but not changes\n"
2102
#: bzrlib/builtins.py:3447
2103
msgid " bzr commit foo -x foo/bar"
2106
#: bzrlib/builtins.py:3449
2107
msgid " A selective commit after a merge is not yet supported."
2110
#: bzrlib/builtins.py:3451
2111
msgid ":Custom authors:"
2114
#: bzrlib/builtins.py:3453
2116
" If the author of the change is not the same person as the committer,\n"
2117
" you can specify the author's name using the --author option. The\n"
2118
" name should be in the same format as a committer-id, e.g.\n"
2119
" \"John Doe <jdoe@example.com>\". If there is more than one author of\n"
2120
" the change you can specify the option multiple times, once for each\n"
2124
#: bzrlib/builtins.py:3460
2128
#: bzrlib/builtins.py:3462
2130
" A common mistake is to forget to add a new file or directory before\n"
2131
" running the commit command. The --strict option checks for unknown\n"
2132
" files and aborts the commit if any are found. More advanced pre-commit\n"
2133
" checks can be implemented by defining hooks. See ``bzr help hooks``\n"
2137
#: bzrlib/builtins.py:3468
2138
msgid ":Things to note:"
2141
#: bzrlib/builtins.py:3470
2143
" If you accidentially commit the wrong changes or make a spelling\n"
2144
" mistake in the commit message say, you can use the uncommit command\n"
2145
" to undo it. See ``bzr help uncommit`` for details."
2148
#: bzrlib/builtins.py:3474
2150
" Hooks can also be configured to run after a commit. This allows you\n"
2151
" to trigger updates to external systems like bug trackers. The --fixes\n"
2152
" option can be used to record the association between a revision and\n"
2153
" one or more bugs. See ``bzr help bugs`` for details."
2156
#: bzrlib/builtins.py:3484
2157
msgid "Do not consider changes made to a given path."
2160
#: bzrlib/builtins.py:3487
2161
msgid "Description of the new revision."
2164
#: bzrlib/builtins.py:3490
2165
msgid "Commit even if nothing has changed."
2168
#: bzrlib/builtins.py:3494
2169
msgid "Take commit message from this file."
2172
#: bzrlib/builtins.py:3496
2173
msgid "Refuse to commit if there are unknown files in the working tree."
2176
#: bzrlib/builtins.py:3499
2178
"Manually set a commit time using commit date format, e.g. '2009-10-10 "
2182
#: bzrlib/builtins.py:3502
2183
msgid "Mark a bug as being fixed by this revision (see \"bzr help bugs\")."
2186
#: bzrlib/builtins.py:3505
2187
msgid "Set the author's name, if it's different from the committer."
2190
#: bzrlib/builtins.py:3508
2192
"Perform a local commit in a bound branch. Local commits are not pushed to "
2193
"the master branch until a normal commit is performed."
2196
#: bzrlib/builtins.py:3514
2198
"When no message is supplied, show the diff along with the status summary in "
2199
"the message editor."
2202
#: bzrlib/builtins.py:3517
2204
"When committing to a foreign version control system do not push data that "
2205
"can not be natively represented."
2208
#: bzrlib/builtins.py:3535
2211
"No tracker specified for bug %s. Use the form 'tracker:id' or specify a "
2212
"default bug tracker using the `bugtracker` option.\n"
2213
"See \"bzr help bugs\" for more information on this feature. Commit refused."
2216
#: bzrlib/builtins.py:3544
2219
"Invalid bug %s. Must be in the form of 'tracker:id'. See \"bzr help bugs\" "
2220
"for more information on this feature.\n"
2224
#: bzrlib/builtins.py:3553
2226
msgid "Unrecognized bug %s. Commit refused."
2229
#: bzrlib/builtins.py:3556
2236
#: bzrlib/builtins.py:3580
2237
msgid "Could not parse --commit-time: "
2240
#: bzrlib/builtins.py:3620
2241
msgid "please specify either --message or --file"
2244
#: bzrlib/builtins.py:3649
2245
msgid "please specify a commit message with either --message or --file"
2248
#: bzrlib/builtins.py:3652
2250
"Empty commit message specified. Please specify a commit message with either -"
2251
"-message or --file or leave a blank message with --message \"\"."
2254
#: bzrlib/builtins.py:3672
2256
"No changes to commit. Please 'bzr add' the files you want to commit, or use -"
2257
"-unchanged to force an empty commit."
2260
#: bzrlib/builtins.py:3676
2262
"Conflicts detected in working tree. Use \"bzr conflicts\" to list, \"bzr "
2263
"resolve FILE\" to resolve."
2266
#: bzrlib/builtins.py:3680
2267
msgid "Commit refused because there are unknown files in the working tree."
2270
#: bzrlib/builtins.py:3683
2273
"To commit to master branch, run update and then commit.\n"
2274
"You can also pass --local to commit to continue working disconnected."
2277
#: bzrlib/builtins.py:3691
2279
"Validate working tree structure, branch consistency and repository history."
2282
#: bzrlib/builtins.py:3693
2284
"This command checks various invariants about branch and repository storage\n"
2285
"to detect data corruption or bzr bugs."
2288
#: bzrlib/builtins.py:3696
2290
"The working tree and branch checks will only give output if a problem is\n"
2291
"detected. The output fields of the repository check are:"
2294
#: bzrlib/builtins.py:3699
2297
" This is just the number of revisions checked. It doesn't\n"
2298
" indicate a problem."
2301
#: bzrlib/builtins.py:3703
2304
" This is just the number of versionedfiles checked. It\n"
2305
" doesn't indicate a problem."
2308
#: bzrlib/builtins.py:3707
2310
"unreferenced ancestors\n"
2311
" Texts that are ancestors of other texts, but\n"
2312
" are not properly referenced by the revision ancestry. This is a\n"
2313
" subtle problem that Bazaar can work around."
2316
#: bzrlib/builtins.py:3712
2318
"unique file texts\n"
2319
" This is the total number of unique file contents\n"
2320
" seen in the checked revisions. It does not indicate a problem."
2323
#: bzrlib/builtins.py:3716
2325
"repeated file texts\n"
2326
" This is the total number of repeated texts seen\n"
2327
" in the checked revisions. Texts can be repeated when their file\n"
2328
" entries are modified, but the file contents are not. It does not\n"
2329
" indicate a problem."
2332
#: bzrlib/builtins.py:3722
2334
"If no restrictions are specified, all Bazaar data that is found at the "
2336
"location will be checked."
2339
#: bzrlib/builtins.py:3727
2340
msgid " Check the tree and branch at 'foo'::"
2343
#: bzrlib/builtins.py:3729
2344
msgid " bzr check --tree --branch foo"
2347
#: bzrlib/builtins.py:3731
2348
msgid " Check only the repository at 'bar'::"
2351
#: bzrlib/builtins.py:3733
2352
msgid " bzr check --repo bar"
2355
#: bzrlib/builtins.py:3735
2356
msgid " Check everything at 'baz'::"
2359
#: bzrlib/builtins.py:3737
2360
msgid " bzr check baz"
2363
#: bzrlib/builtins.py:3743
2364
msgid "Check the branch related to the current directory."
2367
#: bzrlib/builtins.py:3745
2368
msgid "Check the repository related to the current directory."
2371
#: bzrlib/builtins.py:3747
2372
msgid "Check the working tree related to the current directory."
2375
#: bzrlib/builtins.py:3761
2376
msgid "Upgrade a repository, branch or working tree to a newer format."
2379
#: bzrlib/builtins.py:3763
2381
"When the default format has changed after a major new release of\n"
2382
"Bazaar, you may be informed during certain operations that you\n"
2383
"should upgrade. Upgrading to a newer format may improve performance\n"
2384
"or make new features available. It may however limit interoperability\n"
2385
"with older repositories or with older versions of Bazaar."
2388
#: bzrlib/builtins.py:3769
2390
"If you wish to upgrade to a particular format rather than the\n"
2391
"current default, that can be specified using the --format option.\n"
2392
"As a consequence, you can use the upgrade command this way to\n"
2393
"\"downgrade\" to an earlier format, though some conversions are\n"
2394
"a one way process (e.g. changing from the 1.x default to the\n"
2395
"2.x default) so downgrading is not always possible."
2398
#: bzrlib/builtins.py:3776
2400
"A backup.bzr.~#~ directory is created at the start of the conversion\n"
2401
"process (where # is a number). By default, this is left there on\n"
2402
"completion. If the conversion fails, delete the new .bzr directory\n"
2403
"and rename this one back in its place. Use the --clean option to ask\n"
2404
"for the backup.bzr directory to be removed on successful conversion.\n"
2405
"Alternatively, you can delete it by hand if everything looks good\n"
2409
#: bzrlib/builtins.py:3784
2411
"If the location given is a shared repository, dependent branches\n"
2412
"are also converted provided the repository converts successfully.\n"
2413
"If the conversion of a branch fails, remaining branches are still\n"
2417
#: bzrlib/builtins.py:3789
2419
"For more information on upgrades, see the Bazaar Upgrade Guide,\n"
2420
"http://doc.bazaar.canonical.com/latest/en/upgrade-guide/."
2423
#: bzrlib/builtins.py:3797
2424
msgid "Upgrade to a specific format. See \"bzr help formats\" for details."
2427
#: bzrlib/builtins.py:3801
2428
msgid "Branch format"
2431
#: bzrlib/builtins.py:3803
2432
msgid "Remove the backup.bzr directory if successful."
2435
#: bzrlib/builtins.py:3805
2436
msgid "Show what would be done, but don't actually do anything."
2439
#: bzrlib/builtins.py:3820
2440
msgid "Show or set bzr user id."
2443
#: bzrlib/builtins.py:3822
2446
" Show the email of the current user::"
2449
#: bzrlib/builtins.py:3825
2450
msgid " bzr whoami --email"
2453
#: bzrlib/builtins.py:3827
2454
msgid " Set the current user::"
2457
#: bzrlib/builtins.py:3829
2458
msgid " bzr whoami \"Frank Chu <fchu@example.com>\""
2461
#: bzrlib/builtins.py:3833
2462
msgid "Display email address only."
2465
#: bzrlib/builtins.py:3835
2466
msgid "Set identity for the current branch instead of globally."
2469
#: bzrlib/builtins.py:3861
2470
msgid "--email can only be used to display existing identity"
2473
#: bzrlib/builtins.py:3885
2474
msgid "Print or set the branch nickname."
2477
#: bzrlib/builtins.py:3887
2479
"If unset, the colocated branch name is used for colocated branches, and\n"
2480
"the branch directory name is used for other branches. To print the\n"
2481
"current nickname, execute with no argument."
2484
#: bzrlib/builtins.py:3891
2486
"Bound branches use the nickname of its master branch unless it is set\n"
2490
#: bzrlib/builtins.py:3911
2491
msgid "Set/unset and display aliases."
2494
#: bzrlib/builtins.py:3913
2497
" Show the current aliases::"
2500
#: bzrlib/builtins.py:3916
2504
#: bzrlib/builtins.py:3918
2505
msgid " Show the alias specified for 'll'::"
2508
#: bzrlib/builtins.py:3920
2509
msgid " bzr alias ll"
2512
#: bzrlib/builtins.py:3922
2513
msgid " Set an alias for 'll'::"
2516
#: bzrlib/builtins.py:3924
2517
msgid " bzr alias ll=\"log --line -r-10..-1\""
2520
#: bzrlib/builtins.py:3926
2521
msgid " To remove an alias for 'll'::"
2524
#: bzrlib/builtins.py:3928
2525
msgid " bzr alias --remove ll"
2528
#: bzrlib/builtins.py:3933
2529
msgid "Remove the alias."
2532
#: bzrlib/builtins.py:3951
2533
msgid "bzr alias --remove expects an alias to remove."
2536
#: bzrlib/builtins.py:4132
2538
"subunit not available. subunit needs to be installed to use --subunit."
2541
#: bzrlib/builtins.py:4149
2543
"--benchmark is no longer supported from bzr 2.2; use bzr-usertest instead"
2546
#: bzrlib/builtins.py:4196
2547
msgid "Show version of bzr."
2550
#: bzrlib/builtins.py:4200
2551
msgid "Print just the version number."
2554
#: bzrlib/builtins.py:4219
2555
msgid "It sure does!\n"
2558
#: bzrlib/builtins.py:4243
2560
msgid "merge base is revision %s\n"
2563
#: bzrlib/builtins.py:4247
2564
msgid "Perform a three-way merge."
2567
#: bzrlib/builtins.py:4249
2569
"The source of the merge can be specified either in the form of a branch,\n"
2570
"or in the form of a path to a file containing a merge directive generated\n"
2571
"with bzr send. If neither is specified, the default is the upstream branch\n"
2572
"or the branch most recently merged using --remember. The source of the\n"
2573
"merge may also be specified in the form of a path to a file in another\n"
2574
"branch: in this case, only the modifications to that file are merged into\n"
2575
"the current working tree."
2578
#: bzrlib/builtins.py:4257
2580
"When merging from a branch, by default bzr will try to merge in all new\n"
2581
"work from the other branch, automatically determining an appropriate base\n"
2582
"revision. If this fails, you may need to give an explicit base."
2585
#: bzrlib/builtins.py:4261
2587
"To pick a different ending revision, pass \"--revision OTHER\". bzr will\n"
2588
"try to merge in all new work up to and including revision OTHER."
2591
#: bzrlib/builtins.py:4264
2593
"If you specify two values, \"--revision BASE..OTHER\", only revisions BASE\n"
2594
"through OTHER, excluding BASE but including OTHER, will be merged. If this\n"
2595
"causes some revisions to be skipped, i.e. if the destination branch does\n"
2596
"not already contain revision BASE, such a merge is commonly referred to as\n"
2597
"a \"cherrypick\". Unlike a normal merge, Bazaar does not currently track\n"
2598
"cherrypicks. The changes look like a normal commit, and the history of the\n"
2599
"changes from the other branch is not stored in the commit."
2602
#: bzrlib/builtins.py:4272
2603
msgid "Revision numbers are always relative to the source branch."
2606
#: bzrlib/builtins.py:4274 bzrlib/conflicts.py:52 bzrlib/conflicts.py:106
2608
"Merge will do its best to combine the changes in two branches, but there\n"
2609
"are some kinds of problems only a human can fix. When it encounters those,\n"
2610
"it will mark a conflict. A conflict means that you need to fix something,\n"
2611
"before you can commit."
2614
#: bzrlib/builtins.py:4279
2616
"Use bzr resolve when you have fixed a problem. See also bzr conflicts."
2619
#: bzrlib/builtins.py:4281
2621
"If there is no default branch set, the first merge will set it (use\n"
2622
"--no-remember to avoid setting it). After that, you can omit the branch\n"
2623
"to use the default. To change the default, use --remember. The value will\n"
2624
"only be saved if the remote location can be accessed."
2627
#: bzrlib/builtins.py:4286
2629
"The results of the merge are placed into the destination working\n"
2630
"directory, where they can be reviewed (with bzr diff), tested, and then\n"
2631
"committed to record the result of the merge."
2634
#: bzrlib/builtins.py:4290
2636
"merge refuses to run if there are any uncommitted changes, unless\n"
2637
"--force is given. If --force is given, then the changes from the source \n"
2638
"will be merged with the current working tree, including any uncommitted\n"
2639
"changes in the tree. The --force option can also be used to create a\n"
2640
"merge revision which has more than two parents."
2643
#: bzrlib/builtins.py:4296
2645
"If one would like to merge changes from the working tree of the other\n"
2646
"branch without merging any committed revisions, the --uncommitted option\n"
2650
#: bzrlib/builtins.py:4300
2652
"To select only some changes to merge, use \"merge -i\", which will prompt\n"
2653
"you to apply each diff hunk and file change, similar to \"shelve\"."
2656
#: bzrlib/builtins.py:4303
2659
" To merge all new revisions from bzr.dev::"
2662
#: bzrlib/builtins.py:4306
2663
msgid " bzr merge ../bzr.dev"
2666
#: bzrlib/builtins.py:4308
2667
msgid " To merge changes up to and including revision 82 from bzr.dev::"
2670
#: bzrlib/builtins.py:4310
2671
msgid " bzr merge -r 82 ../bzr.dev"
2674
#: bzrlib/builtins.py:4312
2675
msgid " To merge the changes introduced by 82, without previous changes::"
2678
#: bzrlib/builtins.py:4314
2679
msgid " bzr merge -r 81..82 ../bzr.dev"
2682
#: bzrlib/builtins.py:4316
2683
msgid " To apply a merge directive contained in /tmp/merge::"
2686
#: bzrlib/builtins.py:4318
2687
msgid " bzr merge /tmp/merge"
2690
#: bzrlib/builtins.py:4320
2692
" To create a merge revision with three parents from two branches\n"
2693
" feature1a and feature1b:"
2696
#: bzrlib/builtins.py:4323
2698
" bzr merge ../feature1a\n"
2699
" bzr merge ../feature1b --force\n"
2700
" bzr commit -m 'revision with three parents'"
2703
#: bzrlib/builtins.py:4335
2704
msgid "Merge even if the destination tree has uncommitted changes."
2707
#: bzrlib/builtins.py:4341
2709
"Apply uncommitted changes from a working copy, instead of branch changes."
2712
#: bzrlib/builtins.py:4343
2714
"If the destination is already completely merged into the source, pull from "
2715
"the source rather than merging. When this happens, you do not need to "
2716
"commit the result."
2719
#: bzrlib/builtins.py:4348
2721
"Branch to merge into, rather than the one containing the working directory."
2724
#: bzrlib/builtins.py:4350
2725
msgid "Instead of merging, show a diff of the merge."
2728
#: bzrlib/builtins.py:4352
2729
msgid "Select changes interactively."
2732
#: bzrlib/builtins.py:4374
2734
"Merging into empty branches not currently supported, "
2735
"https://bugs.launchpad.net/bzr/+bug/308562"
2738
#: bzrlib/builtins.py:4401
2739
msgid "Cannot use --uncommitted with bundles or merge directives."
2742
#: bzrlib/builtins.py:4412
2743
msgid "Cannot use --uncommitted and --revision at the same time."
2746
#: bzrlib/builtins.py:4432
2750
#: bzrlib/builtins.py:4434 bzrlib/bundle/apply_bundle.py:71
2751
msgid "Nothing to do."
2754
#: bzrlib/builtins.py:4438
2755
msgid "Cannot pull individual files"
2758
#: bzrlib/builtins.py:4446
2759
msgid "This branch has no commits. (perhaps you would prefer 'bzr pull')"
2762
#: bzrlib/builtins.py:4504
2764
msgid "Show-base is not supported for this merge type. %s"
2767
#: bzrlib/builtins.py:4513
2769
msgid "Conflict reduction is not supported for merge type %s."
2772
#: bzrlib/builtins.py:4517
2773
msgid "Cannot do conflict reduction and show base."
2776
#: bzrlib/builtins.py:4628
2777
msgid "No location specified or remembered"
2780
#: bzrlib/builtins.py:4630
2781
msgid "{0} remembered {1} location {2}"
2784
#: bzrlib/builtins.py:4636
2785
msgid "Redo a merge."
2788
#: bzrlib/builtins.py:4638
2790
"Use this if you want to try a different merge technique while resolving\n"
2791
"conflicts. Some merge techniques are better than others, and remerge\n"
2792
"lets you try different ones on different files."
2795
#: bzrlib/builtins.py:4642
2797
"The options for remerge have the same meaning and defaults as the ones for\n"
2798
"merge. The difference is that remerge can (only) be run when there is a\n"
2799
"pending merge, and it lets you specify particular files."
2802
#: bzrlib/builtins.py:4646
2805
" Re-do the merge of all conflicted files, and show the base text in\n"
2806
" conflict regions, in addition to the usual THIS and OTHER texts::"
2809
#: bzrlib/builtins.py:4650
2810
msgid " bzr remerge --show-base"
2813
#: bzrlib/builtins.py:4652
2815
" Re-do the merge of \"foobar\", using the weave merge algorithm, with\n"
2816
" additional processing to reduce the size of conflict regions::"
2819
#: bzrlib/builtins.py:4655
2820
msgid " bzr remerge --merge-type weave --reprocess foobar"
2823
#: bzrlib/builtins.py:4662
2824
msgid "Show base revision text in conflicts."
2827
#: bzrlib/builtins.py:4674
2829
"Sorry, remerge only works after normal merges. Not cherrypicking or multi-"
2833
#: bzrlib/builtins.py:4731
2834
msgid "Revert files to a previous revision."
2837
#: bzrlib/builtins.py:4733
2839
"Giving a list of files will revert only those files. Otherwise, all files\n"
2840
"will be reverted. If the revision is not specified with '--revision', the\n"
2841
"last committed revision is used."
2844
#: bzrlib/builtins.py:4737
2846
"To remove only some changes, without reverting to a prior version, use\n"
2847
"merge instead. For example, \"merge . -r -2..-3\" (don't forget the \".\")\n"
2848
"will remove the changes introduced by the second last commit (-2), without\n"
2849
"affecting the changes introduced by the last commit (-1). To remove\n"
2850
"certain changes on a hunk-by-hunk basis, see the shelve command."
2853
#: bzrlib/builtins.py:4743
2855
"By default, any files that have been manually changed will be backed up\n"
2856
"first. (Files changed only by merge are not backed up.) Backup files have\n"
2857
"'.~#~' appended to their name, where # is a number."
2860
#: bzrlib/builtins.py:4747
2862
"When you provide files, you can use their current pathname or the pathname\n"
2863
"from the target revision. So you can use revert to \"undelete\" a file by\n"
2864
"name. If you name a directory, all the contents of that directory will be\n"
2868
#: bzrlib/builtins.py:4752
2870
"If you have newly added files since the target revision, they will be\n"
2871
"removed. If the files to be removed have been changed, backups will be\n"
2872
"created as above. Directories containing unknown files will not be\n"
2876
#: bzrlib/builtins.py:4757
2878
"The working tree contains a list of revisions that have been merged but\n"
2879
"not yet committed. These revisions will be included as additional parents\n"
2880
"of the next commit. Normally, using revert clears that list as well as\n"
2881
"reverting the files. If any files are specified, revert leaves the list\n"
2882
"of uncommitted merges alone and reverts only the files. Use ``bzr revert\n"
2883
".`` in the tree root to revert all files but keep the recorded merges,\n"
2884
"and ``bzr revert --forget-merges`` to clear the pending merge list without\n"
2885
"reverting any files."
2888
#: bzrlib/builtins.py:4766
2890
"Using \"bzr revert --forget-merges\", it is possible to apply all of the\n"
2891
"changes from a branch in a single revision. To do this, perform the merge\n"
2892
"as desired. Then doing revert with the \"--forget-merges\" option will "
2894
"the content of the tree as it was, but it will clear the list of pending\n"
2895
"merges. The next commit will then contain all of the changes that are\n"
2896
"present in the other branch, but without any other parent revisions.\n"
2897
"Because this technique forgets where these changes originated, it may\n"
2898
"cause additional conflicts on later merges involving the same source and\n"
2902
#: bzrlib/builtins.py:4780
2903
msgid "Do not save backups of reverted files."
2906
#: bzrlib/builtins.py:4782
2907
msgid "Remove pending merge marker, without changing any files."
2910
#: bzrlib/builtins.py:4813
2912
"Show help on a command or other topic.\n"
2916
#: bzrlib/builtins.py:4818
2917
msgid "Show help on all commands."
2920
#: bzrlib/builtins.py:4847
2921
msgid "Show unmerged/unpulled revisions between two branches."
2924
#: bzrlib/builtins.py:4849
2925
msgid "OTHER_BRANCH may be local or remote."
2928
#: bzrlib/builtins.py:4851
2930
"To filter on a range of revisions, you can use the command -r begin..end\n"
2931
"-r revision requests a specific revision, -r ..end or -r begin.. are\n"
2935
" 1 - some missing revisions\n"
2936
" 0 - no missing revisions"
2939
#: bzrlib/builtins.py:4861
2941
" Determine the missing revisions between this and the branch at the\n"
2942
" remembered pull location::"
2945
#: bzrlib/builtins.py:4864
2946
msgid " bzr missing"
2949
#: bzrlib/builtins.py:4866
2950
msgid " Determine the missing revisions between this and another branch::"
2953
#: bzrlib/builtins.py:4868
2954
msgid " bzr missing http://server/branch"
2957
#: bzrlib/builtins.py:4870
2959
" Determine the missing revisions up to a specific revision on the other\n"
2963
#: bzrlib/builtins.py:4873
2964
msgid " bzr missing -r ..-10"
2967
#: bzrlib/builtins.py:4875
2969
" Determine the missing revisions up to a specific revision on this\n"
2973
#: bzrlib/builtins.py:4878
2974
msgid " bzr missing --my-revision ..-10"
2977
#: bzrlib/builtins.py:4885
2978
msgid "Reverse the order of revisions."
2981
#: bzrlib/builtins.py:4887
2982
msgid "Display changes in the local branch only."
2985
#: bzrlib/builtins.py:4888
2986
msgid "Same as --mine-only."
2989
#: bzrlib/builtins.py:4890
2990
msgid "Display changes in the remote branch only."
2993
#: bzrlib/builtins.py:4891
2994
msgid "Same as --theirs-only."
2997
#: bzrlib/builtins.py:4896
2999
"Filter on other branch revisions (inclusive). See \"help revisionspec\" for "
3003
#: bzrlib/builtins.py:4900
3005
"Filter on local branch revisions (inclusive). See \"help revisionspec\" for "
3009
#: bzrlib/builtins.py:4903
3010
msgid "Show all revisions in addition to the mainline ones."
3013
#: bzrlib/builtins.py:4957
3014
msgid "No peer location known or specified."
3017
#: bzrlib/builtins.py:4961
3018
msgid "Using saved parent location: {0}\n"
3021
#: bzrlib/builtins.py:4994
3023
msgid "You have %d extra revision:\n"
3024
msgid_plural "You have %d extra revisions:\n"
3028
#: bzrlib/builtins.py:5010
3030
msgid "You are missing %d revision:\n"
3031
msgid_plural "You are missing %d revisions:\n"
3035
#: bzrlib/builtins.py:5022
3036
msgid "This branch has no new revisions.\n"
3039
#: bzrlib/builtins.py:5025
3040
msgid "Other branch has no new revisions.\n"
3043
#: bzrlib/builtins.py:5030
3044
msgid "Branches are up to date.\n"
3047
#: bzrlib/builtins.py:5041
3048
msgid "Compress the data within a repository."
3051
#: bzrlib/builtins.py:5043
3053
"This operation compresses the data within a bazaar repository. As\n"
3054
"bazaar supports automatic packing of repository, this operation is\n"
3055
"normally not required to be done manually."
3058
#: bzrlib/builtins.py:5047
3060
"During the pack operation, bazaar takes a backup of existing repository\n"
3061
"data, i.e. pack files. This backup is eventually removed by bazaar\n"
3062
"automatically when it is safe to do so. To save disk space by removing\n"
3063
"the backed up pack files, the --clean-obsolete-packs option may be\n"
3067
#: bzrlib/builtins.py:5053
3069
"Warning: If you use --clean-obsolete-packs and your machine crashes\n"
3070
"during or immediately after repacking, you may be left with a state\n"
3071
"where the deletion has been written to disk but the new packs have not\n"
3072
"been. In this case the repository may be unusable."
3075
#: bzrlib/builtins.py:5062
3076
msgid "Delete obsolete packs to save disk space."
3079
#: bzrlib/builtins.py:5076
3080
msgid "List the installed plugins."
3083
#: bzrlib/builtins.py:5078
3085
"This command displays the list of installed plugins including\n"
3086
"version of plugin and a short description of each."
3089
#: bzrlib/builtins.py:5081
3090
msgid "--verbose shows the path where each plugin is located."
3093
#: bzrlib/builtins.py:5083
3095
"A plugin is an external component for Bazaar that extends the\n"
3096
"revision control system, by adding or replacing code in Bazaar.\n"
3097
"Plugins can do a variety of things, including overriding commands,\n"
3098
"adding new commands, providing additional network transports and\n"
3099
"customizing log output."
3102
#: bzrlib/builtins.py:5089
3104
"See the Bazaar Plugin Guide <http://doc.bazaar.canonical.com/plugins/en/>\n"
3105
"for further information on plugins including where to find them and how to\n"
3106
"install them. Instructions are also provided there on how to write new\n"
3107
"plugins using the Python programming language."
3110
#: bzrlib/builtins.py:5105
3111
msgid "Show testament (signing-form) of a revision."
3114
#: bzrlib/builtins.py:5108
3115
msgid "Produce long-format testament."
3118
#: bzrlib/builtins.py:5110
3119
msgid "Produce a strict-format testament."
3122
#: bzrlib/builtins.py:5136
3123
msgid "Show the origin of each line in a file."
3126
#: bzrlib/builtins.py:5138
3128
"This prints out the given file with an annotation on the left side\n"
3129
"indicating which revision, author and date introduced the change."
3132
#: bzrlib/builtins.py:5141
3134
"If the origin is the same for a run of consecutive lines, it is\n"
3135
"shown only at the top, unless the --all option is given."
3138
#: bzrlib/builtins.py:5149
3139
msgid "Show annotations on all lines."
3142
#: bzrlib/builtins.py:5150
3143
msgid "Show commit date in annotations."
3146
#: bzrlib/builtins.py:5237
3147
msgid "Cannot sign a range of non-revision-history revisions"
3150
#: bzrlib/builtins.py:5249
3151
msgid "Please supply either one revision, or a range."
3154
#: bzrlib/builtins.py:5253
3156
"Convert the current branch into a checkout of the supplied branch.\n"
3157
"If no branch is supplied, rebind to the last bound location."
3160
#: bzrlib/builtins.py:5256
3162
"Once converted into a checkout, commits must succeed on the master branch\n"
3163
"before they will be applied to the local branch."
3166
#: bzrlib/builtins.py:5259
3168
"Bound branches use the nickname of its master branch unless it is set\n"
3169
"locally, in which case binding will update the local nickname to be\n"
3170
"that of the master."
3173
#: bzrlib/builtins.py:5274
3174
msgid "No location supplied. This format does not remember old locations."
3177
#: bzrlib/builtins.py:5280
3178
msgid "Branch is already bound"
3181
#: bzrlib/builtins.py:5283
3182
msgid "No location supplied and no previous location known"
3185
#: bzrlib/builtins.py:5289
3186
msgid "These branches have diverged. Try merging, and then bind again."
3189
#: bzrlib/builtins.py:5296
3190
msgid "Convert the current checkout into a regular branch."
3193
#: bzrlib/builtins.py:5298
3195
"After unbinding, the local branch is considered independent and subsequent\n"
3196
"commits will be local only."
3199
#: bzrlib/builtins.py:5309
3200
msgid "Local branch is not bound"
3203
#: bzrlib/builtins.py:5313
3204
msgid "Remove the last committed revision."
3207
#: bzrlib/builtins.py:5315
3209
"--verbose will print out what is being removed.\n"
3210
"--dry-run will go through all the motions, but not actually\n"
3214
#: bzrlib/builtins.py:5319
3216
"If --revision is specified, uncommit revisions to leave the branch at the\n"
3217
"specified revision. For example, \"bzr uncommit -r 15\" will leave the\n"
3218
"branch at revision 15."
3221
#: bzrlib/builtins.py:5323
3223
"Uncommit leaves the working tree ready for a new commit. The only change\n"
3224
"it may make is to restore any pending merges that were present before\n"
3228
#: bzrlib/builtins.py:5334
3229
msgid "Don't actually make changes."
3232
#: bzrlib/builtins.py:5335
3233
msgid "Say yes to all questions."
3236
#: bzrlib/builtins.py:5337
3237
msgid "Keep tags that point to removed revisions."
3240
#: bzrlib/builtins.py:5339
3241
msgid "Only remove the commits from the local branch when in a checkout."
3244
#: bzrlib/builtins.py:5388
3245
msgid "No revisions to uncommit.\n"
3248
#: bzrlib/builtins.py:5403
3249
msgid "Dry-run, pretending to remove the above revisions.\n"
3252
#: bzrlib/builtins.py:5406
3253
msgid "The above revision(s) will be removed.\n"
3256
#: bzrlib/builtins.py:5410
3257
msgid "Uncommit these revisions"
3260
#: bzrlib/builtins.py:5413
3264
#: bzrlib/builtins.py:5420
3267
"You can restore the old tip by running:\n"
3268
" bzr pull . -r revid:%s\n"
3271
#: bzrlib/builtins.py:5425
3272
msgid "Break a dead lock."
3275
#: bzrlib/builtins.py:5427
3277
"This command breaks a lock on a repository, branch, working directory or\n"
3281
#: bzrlib/builtins.py:5430
3283
"CAUTION: Locks should only be broken when you are sure that the process\n"
3284
"holding the lock has been stopped."
3287
#: bzrlib/builtins.py:5433
3289
"You can get information on what locks are open via the 'bzr info\n"
3290
"[location]' command."
3293
#: bzrlib/builtins.py:5436
3297
" bzr break-lock bzr+ssh://example.com/bzr/foo\n"
3298
" bzr break-lock --conf ~/.bazaar"
3301
#: bzrlib/builtins.py:5445
3302
msgid "LOCATION is the directory where the config lock is."
3305
#: bzrlib/builtins.py:5447
3306
msgid "Do not ask for confirmation before breaking the lock."
3309
#: bzrlib/builtins.py:5482
3310
msgid "The Bazaar smart server protocol over TCP. (default port: 4155)"
3313
#: bzrlib/builtins.py:5483
3314
msgid "Run the bzr server."
3317
#: bzrlib/builtins.py:5489
3318
msgid "Serve on stdin/out for use from inetd or sshd."
3321
#: bzrlib/builtins.py:5490
3325
#: bzrlib/builtins.py:5491
3326
msgid "Protocol to serve."
3329
#: bzrlib/builtins.py:5495
3330
msgid "Listen for connections on nominated address."
3333
#: bzrlib/builtins.py:5497
3335
"Listen for connections on nominated port. Passing 0 as the port number will "
3336
"result in a dynamically allocated port. The default port depends on the "
3340
#: bzrlib/builtins.py:5502
3341
msgid "Serve contents of this directory."
3344
#: bzrlib/builtins.py:5504
3346
"By default the server is a readonly server. Supplying --allow-writes "
3347
"enables write access to the contents of the served directory and below. "
3348
"Note that ``bzr serve`` does not perform authentication, so unless some form "
3349
"of external authentication is arranged supplying this option leads to global "
3350
"uncontrolled write access to your file system."
3353
#: bzrlib/builtins.py:5513
3354
msgid "Override the default idle client timeout (5min)."
3357
#: bzrlib/builtins.py:5531
3358
msgid "Combine a tree into its containing tree."
3361
#: bzrlib/builtins.py:5533
3362
msgid "This command requires the target tree to be in a rich-root format."
3365
#: bzrlib/builtins.py:5535
3367
"The TREE argument should be an independent tree, inside another tree, but\n"
3368
"not part of it. (Such trees can be produced by \"bzr split\", but also by\n"
3369
"running \"bzr branch\" with the target inside a tree.)"
3372
#: bzrlib/builtins.py:5539
3374
"The result is a combined tree, with the subtree no longer an independent\n"
3375
"part. This is marked as a merge of the subtree into the containing tree,\n"
3376
"and all history is preserved."
3379
#: bzrlib/builtins.py:5557
3382
"Can't join trees because %s doesn't support rich root data.\n"
3383
"You can use bzr upgrade on the repository."
3386
#: bzrlib/builtins.py:5567 bzrlib/builtins.py:5573
3387
msgid "Cannot join {0}. {1}"
3390
#: bzrlib/builtins.py:5577
3391
msgid "Split a subdirectory of a tree into a separate tree."
3394
#: bzrlib/builtins.py:5579
3396
"This command will produce a target tree in a format that supports\n"
3397
"rich roots, like 'rich-root' or 'rich-root-pack'. These formats cannot be\n"
3398
"converted into earlier formats like 'dirstate-tags'."
3401
#: bzrlib/builtins.py:5583
3403
"The TREE argument should be a subdirectory of a working tree. That\n"
3404
"subdirectory will be converted into an independent tree, with its own\n"
3405
"branch. Commits in the top-level tree will not apply to the new subtree."
3408
#: bzrlib/builtins.py:5663
3409
msgid "No submit branch specified or known"
3412
#: bzrlib/builtins.py:5672 bzrlib/send.py:109
3413
msgid "No public branch specified or known"
3416
#: bzrlib/builtins.py:5677
3417
msgid "bzr merge-directive takes at most two one revision identifiers"
3420
#: bzrlib/builtins.py:5686
3421
msgid "No revisions to bundle."
3424
#: bzrlib/builtins.py:5705
3425
msgid "Mail or create a merge-directive for submitting changes."
3428
#: bzrlib/builtins.py:5707
3429
msgid "A merge directive provides many things needed for requesting merges:"
3432
#: bzrlib/builtins.py:5709
3433
msgid "* A machine-readable description of the merge to perform"
3436
#: bzrlib/builtins.py:5711
3437
msgid "* An optional patch that is a preview of the changes requested"
3440
#: bzrlib/builtins.py:5713
3442
"* An optional bundle of revision data, so that the changes can be applied\n"
3443
" directly from the merge directive, without retrieving data from a\n"
3447
#: bzrlib/builtins.py:5717
3449
"`bzr send` creates a compact data set that, when applied using bzr\n"
3450
"merge, has the same effect as merging from the source branch. "
3453
#: bzrlib/builtins.py:5720
3455
"By default the merge directive is self-contained and can be applied to any\n"
3456
"branch containing submit_branch in its ancestory without needing access to\n"
3457
"the source branch."
3460
#: bzrlib/builtins.py:5724
3462
"If --no-bundle is specified, then Bazaar doesn't send the contents of the\n"
3463
"revisions, but only a structured request to merge from the\n"
3464
"public_location. In that case the public_branch is needed and it must be\n"
3465
"up-to-date and accessible to the recipient. The public_branch is always\n"
3466
"included if known, so that people can check it later."
3469
#: bzrlib/builtins.py:5730
3471
"The submit branch defaults to the parent of the source branch, but can be\n"
3472
"overridden. Both submit branch and public branch will be remembered in\n"
3473
"branch.conf the first time they are used for a particular branch. The\n"
3474
"source branch defaults to that containing the working directory, but can\n"
3475
"be changed using --from."
3478
#: bzrlib/builtins.py:5736
3480
"Both the submit branch and the public branch follow the usual behavior with\n"
3481
"respect to --remember: If there is no default location set, the first send\n"
3482
"will set it (use --no-remember to avoid setting it). After that, you can\n"
3483
"omit the location to use the default. To change the default, use\n"
3484
"--remember. The value will only be saved if the location can be accessed."
3487
#: bzrlib/builtins.py:5742
3489
"In order to calculate those changes, bzr must analyse the submit branch.\n"
3490
"Therefore it is most efficient for the submit branch to be a local mirror.\n"
3491
"If a public location is known for the submit_branch, that location is used\n"
3492
"in the merge directive."
3495
#: bzrlib/builtins.py:5747
3497
"The default behaviour is to send the merge directive by mail, unless -o is\n"
3498
"given, in which case it is sent to a file."
3501
#: bzrlib/builtins.py:5750
3503
"Mail is sent using your preferred mail program. This should be transparent\n"
3504
"on Windows (it uses MAPI). On Unix, it requires the xdg-email utility.\n"
3505
"If the preferred client can't be found (or used), your editor will be used."
3508
#: bzrlib/builtins.py:5754
3510
"To use a specific mail program, set the mail_client configuration option.\n"
3511
"(For Thunderbird 1.5, this works around some bugs.) Supported values for\n"
3512
"specific clients are \"claws\", \"evolution\", \"kmail\", \"mail.app\" "
3514
"Mail.app), \"mutt\", and \"thunderbird\"; generic options are \"default\",\n"
3515
"\"editor\", \"emacsclient\", \"mapi\", and \"xdg-email\". Plugins may also "
3517
"supported clients."
3520
#: bzrlib/builtins.py:5761
3522
"If mail is being sent, a to address is required. This can be supplied\n"
3523
"either on the commandline, by setting the submit_to configuration\n"
3524
"option in the branch itself or the child_submit_to configuration option\n"
3525
"in the submit branch."
3528
#: bzrlib/builtins.py:5766
3530
"Two formats are currently supported: \"4\" uses revision bundle format 4 "
3532
"merge directive format 2. It is significantly faster and smaller than\n"
3533
"older formats. It is compatible with Bazaar 0.19 and later. It is the\n"
3534
"default. \"0.9\" uses revision bundle format 0.9 and merge directive\n"
3535
"format 1. It is compatible with Bazaar 0.12 - 0.18."
3538
#: bzrlib/builtins.py:5772
3540
"The merge directives created by bzr send may be applied using bzr merge or\n"
3541
"bzr pull by specifying a file containing a merge directive as the location."
3544
#: bzrlib/builtins.py:5775
3546
"bzr send makes extensive use of public locations to map local locations "
3548
"URLs that can be used by other people. See `bzr help configuration` to\n"
3549
"set them, and use `bzr info` to display them."
3552
#: bzrlib/builtins.py:5799
3553
msgid "Write merge directive to this file or directory; use - for stdout."
3556
#: bzrlib/builtins.py:5803
3558
"Refuse to send if there are uncommitted changes in the working tree, --no-"
3559
"strict disables the check."
3562
#: bzrlib/builtins.py:5805
3563
msgid "Mail the request to this address."
3566
#: bzrlib/builtins.py:5809
3567
msgid "Body for the email."
3570
#: bzrlib/builtins.py:5862
3571
msgid "Do not include a bundle in the merge directive."
3574
#: bzrlib/builtins.py:5863
3575
msgid "Do not include a preview patch in the merge directive."
3578
#: bzrlib/builtins.py:5866
3579
msgid "Remember submit and public branch."
3582
#: bzrlib/builtins.py:5868
3584
"Branch to generate the submission from, rather than the one containing the "
3585
"working directory."
3588
#: bzrlib/builtins.py:5878 bzrlib/cmd_version_info.py:76
3592
#: bzrlib/builtins.py:5879
3593
msgid "Use the specified output format."
3596
#: bzrlib/builtins.py:5901
3597
msgid "Create, remove or modify a tag naming a revision."
3600
#: bzrlib/builtins.py:5903
3602
"Tags give human-meaningful names to revisions. Commands that take a -r\n"
3603
"(--revision) option can be given -rtag:X, where X is any previously\n"
3607
#: bzrlib/builtins.py:5907
3609
"Tags are stored in the branch. Tags are copied from one branch to another\n"
3610
"along when you branch, push, pull or merge."
3613
#: bzrlib/builtins.py:5910
3615
"It is an error to give a tag name that already exists unless you pass\n"
3616
"--force, in which case the tag is moved to point to the new revision."
3619
#: bzrlib/builtins.py:5913
3621
"To rename a tag (change the name but keep it on the same revsion), run "
3623
"tag new-name -r tag:old-name`` and then ``bzr tag --delete oldname``."
3626
#: bzrlib/builtins.py:5916
3628
"If no tag name is specified it will be determined through the \n"
3629
"'automatic_tag_name' hook. This can e.g. be used to automatically tag\n"
3630
"upstream releases by reading configure.ac. See ``bzr help hooks`` for\n"
3634
#: bzrlib/builtins.py:5926
3635
msgid "Delete this tag rather than placing it."
3638
#: bzrlib/builtins.py:5929
3639
msgid "Branch in which to place the tag."
3642
#: bzrlib/builtins.py:5931
3643
msgid "Replace existing tags."
3646
#: bzrlib/builtins.py:5946
3647
msgid "No tag specified to delete."
3650
#: bzrlib/builtins.py:5948
3652
msgid "Deleted tag %s."
3655
#: bzrlib/builtins.py:5962
3656
msgid "Please specify a tag name."
3659
#: bzrlib/builtins.py:5970
3661
msgid "Tag %s already exists for that revision."
3664
#: bzrlib/builtins.py:5974
3666
msgid "Created tag %s."
3669
#: bzrlib/builtins.py:5976
3671
msgid "Updated tag %s."
3674
#: bzrlib/builtins.py:5980
3678
#: bzrlib/builtins.py:5982
3680
"This command shows a table of tag names and the revisions they reference."
3683
#: bzrlib/builtins.py:5988
3684
msgid "Branch whose tags should be displayed."
3687
#: bzrlib/builtins.py:5990
3688
msgid "Sort tags by different criteria."
3691
#: bzrlib/builtins.py:5990
3695
#: bzrlib/builtins.py:6059
3696
msgid "Reconfigure the type of a bzr directory."
3699
#: bzrlib/builtins.py:6061
3700
msgid "A target configuration must be specified."
3703
#: bzrlib/builtins.py:6063
3705
"For checkouts, the bind-to location will be auto-detected if not specified.\n"
3706
"The order of preference is\n"
3707
"1. For a lightweight checkout, the current bound location.\n"
3708
"2. For branches that used to be checkouts, the previously-bound location.\n"
3709
"3. The push location.\n"
3710
"4. The parent location.\n"
3711
"If none of these is available, --bind-to must be specified."
3714
#: bzrlib/builtins.py:6077
3718
#: bzrlib/builtins.py:6078
3719
msgid "The relation between branch and tree."
3722
#: bzrlib/builtins.py:6080
3723
msgid "Reconfigure to be an unbound branch with no working tree."
3726
#: bzrlib/builtins.py:6081
3727
msgid "Reconfigure to be an unbound branch with a working tree."
3730
#: bzrlib/builtins.py:6082
3731
msgid "Reconfigure to be a bound branch with a working tree."
3734
#: bzrlib/builtins.py:6083
3735
msgid "Reconfigure to be a lightweight checkout (with no local history)."
3738
#: bzrlib/builtins.py:6088
3739
msgid "Repository type"
3742
#: bzrlib/builtins.py:6089
3743
msgid "Location fo the repository."
3746
#: bzrlib/builtins.py:6091
3748
"Reconfigure to be a standalone branch (i.e. stop using shared repository)."
3751
#: bzrlib/builtins.py:6093
3752
msgid "Reconfigure to use a shared repository."
3755
#: bzrlib/builtins.py:6097
3756
msgid "Trees in Repository"
3759
#: bzrlib/builtins.py:6098
3760
msgid "Whether new branches in the repository have trees."
3763
#: bzrlib/builtins.py:6100
3765
"Reconfigure repository to create working trees on branches by default."
3768
#: bzrlib/builtins.py:6102
3770
"Reconfigure repository to not create working trees on branches by default."
3773
#: bzrlib/builtins.py:6105
3774
msgid "Branch to bind checkout to."
3777
#: bzrlib/builtins.py:6107
3778
msgid "Perform reconfiguration even if local changes will be lost."
3781
#: bzrlib/builtins.py:6110
3782
msgid "Reconfigure a branch to be stacked on another branch."
3785
#: bzrlib/builtins.py:6114
3787
"Reconfigure a branch to be unstacked. This may require copying substantial "
3791
#: bzrlib/builtins.py:6124
3792
msgid "Can't use both --stacked-on and --unstacked"
3795
#: bzrlib/builtins.py:6138
3796
msgid "No target configuration specified"
3799
#: bzrlib/builtins.py:6173
3800
msgid "Set the branch of a checkout and update."
3803
#: bzrlib/builtins.py:6175
3805
"For lightweight checkouts, this changes the branch being referenced.\n"
3806
"For heavyweight checkouts, this checks that there are no local commits\n"
3807
"versus the current bound branch, then it makes the local branch a mirror\n"
3808
"of the new location and binds to it."
3811
#: bzrlib/builtins.py:6180
3813
"In both cases, the working tree is updated and uncommitted changes\n"
3814
"are merged. The user can commit or revert these as they desire."
3817
#: bzrlib/builtins.py:6183
3818
msgid "Pending merges need to be committed or reverted before using switch."
3821
#: bzrlib/builtins.py:6185
3823
"The path to the branch to switch to can be specified relative to the parent\n"
3824
"directory of the current branch. For example, if you are currently in a\n"
3825
"checkout of /path/to/branch, specifying 'newbranch' will find a branch at\n"
3826
"/path/to/newbranch."
3829
#: bzrlib/builtins.py:6190
3831
"Bound branches use the nickname of its master branch unless it is set\n"
3832
"locally, in which case switching will update the local nickname to be\n"
3833
"that of the master."
3836
#: bzrlib/builtins.py:6198
3837
msgid "Switch even if local commits will be lost."
3840
#: bzrlib/builtins.py:6201
3841
msgid "Create the target branch from this one before switching to it."
3844
#: bzrlib/builtins.py:6215
3845
msgid "You must supply either a revision or a location"
3848
#: bzrlib/builtins.py:6228
3849
msgid "cannot create branch without source branch"
3852
#: bzrlib/builtins.py:6253
3853
msgid "Manage filtered views."
3856
#: bzrlib/builtins.py:6255
3858
"Views provide a mask over the tree so that users can focus on\n"
3859
"a subset of a tree when doing their work. After creating a view,\n"
3860
"commands that support a list of files - status, diff, commit, etc -\n"
3861
"effectively have that list of files implicitly given each time.\n"
3862
"An explicit list of files can still be given but those files\n"
3863
"must be within the current view."
3866
#: bzrlib/builtins.py:6262
3868
"In most cases, a view has a short life-span: it is created to make\n"
3869
"a selected change and is deleted once that change is committed.\n"
3870
"At other times, you may wish to create one or more named views\n"
3871
"and switch between them."
3874
#: bzrlib/builtins.py:6267
3876
"To disable the current view without deleting it, you can switch to\n"
3877
"the pseudo view called ``off``. This can be useful when you need\n"
3878
"to see the whole tree for an operation or two (e.g. merge) but\n"
3879
"want to switch back to your view after that."
3882
#: bzrlib/builtins.py:6272
3885
" To define the current view::"
3888
#: bzrlib/builtins.py:6275
3889
msgid " bzr view file1 dir1 ..."
3892
#: bzrlib/builtins.py:6277
3893
msgid " To list the current view::"
3896
#: bzrlib/builtins.py:6279
3900
#: bzrlib/builtins.py:6281
3901
msgid " To delete the current view::"
3904
#: bzrlib/builtins.py:6283
3905
msgid " bzr view --delete"
3908
#: bzrlib/builtins.py:6285
3909
msgid " To disable the current view without deleting it::"
3912
#: bzrlib/builtins.py:6287
3913
msgid " bzr view --switch off"
3916
#: bzrlib/builtins.py:6289
3917
msgid " To define a named view and switch to it::"
3920
#: bzrlib/builtins.py:6291
3921
msgid " bzr view --name view-name file1 dir1 ..."
3924
#: bzrlib/builtins.py:6293
3925
msgid " To list a named view::"
3928
#: bzrlib/builtins.py:6295
3929
msgid " bzr view --name view-name"
3932
#: bzrlib/builtins.py:6297
3933
msgid " To delete a named view::"
3936
#: bzrlib/builtins.py:6299
3937
msgid " bzr view --name view-name --delete"
3940
#: bzrlib/builtins.py:6301
3941
msgid " To switch to a named view::"
3944
#: bzrlib/builtins.py:6303
3945
msgid " bzr view --switch view-name"
3948
#: bzrlib/builtins.py:6305
3949
msgid " To list all views defined::"
3952
#: bzrlib/builtins.py:6307
3953
msgid " bzr view --all"
3956
#: bzrlib/builtins.py:6309
3957
msgid " To delete all views::"
3960
#: bzrlib/builtins.py:6311
3961
msgid " bzr view --delete --all"
3964
#: bzrlib/builtins.py:6318
3965
msgid "Apply list or delete action to all views."
3968
#: bzrlib/builtins.py:6321
3969
msgid "Delete the view."
3972
#: bzrlib/builtins.py:6324
3973
msgid "Name of the view to define, list or delete."
3976
#: bzrlib/builtins.py:6328
3977
msgid "Name of the view to switch to."
3980
#: bzrlib/builtins.py:6347
3981
msgid "Both --delete and a file list specified"
3984
#: bzrlib/builtins.py:6350
3985
msgid "Both --delete and --switch specified"
3988
#: bzrlib/builtins.py:6353
3989
msgid "Deleted all views.\n"
3992
#: bzrlib/builtins.py:6355
3993
msgid "No current view to delete"
3996
#: bzrlib/builtins.py:6358
3998
msgid "Deleted '%s' view.\n"
4001
#: bzrlib/builtins.py:6362
4002
msgid "Both --switch and a file list specified"
4005
#: bzrlib/builtins.py:6365
4006
msgid "Both --switch and --all specified"
4009
#: bzrlib/builtins.py:6368
4010
msgid "No current view to disable"
4013
#: bzrlib/builtins.py:6370
4015
msgid "Disabled '%s' view.\n"
4018
#: bzrlib/builtins.py:6374 bzrlib/builtins.py:6396
4019
msgid "Using '{0}' view: {1}\n"
4022
#: bzrlib/builtins.py:6377
4023
msgid "Views defined:\n"
4026
#: bzrlib/builtins.py:6386
4027
msgid "No views defined.\n"
4030
#: bzrlib/builtins.py:6393
4031
msgid "Cannot change the 'off' pseudo view"
4034
#: bzrlib/builtins.py:6401
4035
msgid "No current view.\n"
4038
#: bzrlib/builtins.py:6404
4039
msgid "'{0}' view is: {1}\n"
4042
#: bzrlib/builtins.py:6424
4043
msgid " <no hooks installed>\n"
4046
#: bzrlib/builtins.py:6428
4047
msgid "Remove a branch."
4050
#: bzrlib/builtins.py:6430
4052
"This will remove the branch from the specified location but \n"
4053
"will keep any working tree or repository in place."
4056
#: bzrlib/builtins.py:6435
4057
msgid " Remove the branch at repo/trunk::"
4060
#: bzrlib/builtins.py:6437
4061
msgid " bzr remove-branch repo/trunk"
4064
#: bzrlib/builtins.py:6444
4065
msgid "Remove branch even if it is the active branch."
4068
#: bzrlib/builtins.py:6458
4069
msgid "Branch is active. Use --force to remove it."
4072
#: bzrlib/builtins.py:6462
4073
msgid "Plaintext diff output."
4076
#: bzrlib/builtins.py:6463
4077
msgid "Temporarily set aside some changes from the current tree."
4080
#: bzrlib/builtins.py:6465
4082
"Shelve allows you to temporarily put changes you've made \"on the shelf\",\n"
4083
"ie. out of the way, until a later time when you can bring them back from\n"
4084
"the shelf with the 'unshelve' command. The changes are stored alongside\n"
4085
"your working tree, and so they aren't propagated along with your branch nor\n"
4086
"will they survive its deletion."
4089
#: bzrlib/builtins.py:6471
4090
msgid "If shelve --list is specified, previously-shelved changes are listed."
4093
#: bzrlib/builtins.py:6473
4095
"Shelve is intended to help separate several sets of changes that have\n"
4096
"been inappropriately mingled. If you just want to get rid of all changes\n"
4097
"and you don't need to restore them later, use revert. If you want to\n"
4098
"shelve all text changes at once, use shelve --all."
4101
#: bzrlib/builtins.py:6478
4103
"If filenames are specified, only the changes to those files will be\n"
4104
"shelved. Other files will be left untouched."
4107
#: bzrlib/builtins.py:6481
4109
"If a revision is specified, changes since that revision will be shelved."
4112
#: bzrlib/builtins.py:6483
4114
"You can put multiple items on the shelf, and by default, 'unshelve' will\n"
4115
"restore the most recently shelved changes."
4118
#: bzrlib/builtins.py:6486
4120
"For complicated changes, it is possible to edit the changes in a separate\n"
4121
"editor program to decide what the file remaining in the working copy\n"
4122
"should look like. To do this, add the configuration option"
4125
#: bzrlib/builtins.py:6490
4126
msgid " change_editor = PROGRAM @new_path @old_path"
4129
#: bzrlib/builtins.py:6492
4131
"where @new_path is replaced with the path of the new version of the \n"
4132
"file and @old_path is replaced with the path of the old version of \n"
4133
"the file. The PROGRAM should save the new file with the desired \n"
4134
"contents of the file in the working tree.\n"
4138
#: bzrlib/builtins.py:6504
4139
msgid "Shelve all changes."
4142
#: bzrlib/builtins.py:6506
4143
msgid "Method to use for writing diffs."
4146
#: bzrlib/builtins.py:6506
4150
#: bzrlib/builtins.py:6510
4151
msgid "List shelved changes."
4154
#: bzrlib/builtins.py:6512
4155
msgid "Destroy removed changes instead of shelving them."
4158
#: bzrlib/builtins.py:6541
4159
msgid "No shelved changes."
4162
#: bzrlib/builtins.py:6552
4163
msgid "Restore shelved changes."
4166
#: bzrlib/builtins.py:6554
4168
"By default, the most recently shelved changes are restored. However if you\n"
4169
"specify a shelf by id those changes will be restored instead. This works\n"
4170
"best when the changes don't depend on each other."
4173
#: bzrlib/builtins.py:6563
4174
msgid "The action to perform."
4177
#: bzrlib/builtins.py:6563 bzrlib/conflicts.py:694
4181
#: bzrlib/builtins.py:6565
4182
msgid "Apply changes and remove from the shelf."
4185
#: bzrlib/builtins.py:6566
4186
msgid "Show changes, but do not apply or remove them."
4189
#: bzrlib/builtins.py:6567
4191
"Instead of unshelving the changes, show the diff that would result from "
4195
#: bzrlib/builtins.py:6569
4196
msgid "Delete changes without applying them."
4199
#: bzrlib/builtins.py:6570
4200
msgid "Apply changes but don't delete them."
4203
#: bzrlib/builtins.py:6585
4204
msgid "Remove unwanted files from working tree."
4207
#: bzrlib/builtins.py:6587
4209
"By default, only unknown files, not ignored files, are deleted. Versioned\n"
4210
"files are never deleted."
4213
#: bzrlib/builtins.py:6590
4215
"Another class is 'detritus', which includes files emitted by bzr during\n"
4216
"normal operations and selftests. (The value of these files decreases with\n"
4220
#: bzrlib/builtins.py:6594
4222
"If no options are specified, unknown files are deleted. Otherwise, option\n"
4223
"flags are respected, and may be combined."
4226
#: bzrlib/builtins.py:6597
4227
msgid "To check what clean-tree will do, use --dry-run."
4230
#: bzrlib/builtins.py:6600
4231
msgid "Delete all ignored files."
4234
#: bzrlib/builtins.py:6601
4236
"Delete conflict files, merge and revert backups, and failed selftest dirs."
4239
#: bzrlib/builtins.py:6604
4240
msgid "Delete files unknown to bzr (default)."
4243
#: bzrlib/builtins.py:6605
4244
msgid "Show files to delete instead of deleting them."
4247
#: bzrlib/builtins.py:6607
4248
msgid "Do not prompt before deleting."
4251
#: bzrlib/bundle/__init__.py:59
4252
msgid "A directory cannot be a bundle"
4255
#: bzrlib/bundle/apply_bundle.py:40
4256
msgid "Install revisions"
4259
#: bzrlib/bundle/commands.py:64
4260
msgid "--verbose requires a merge directive"
4263
#: bzrlib/bundle/commands.py:67
4264
msgid "Bundle format not supported"
4267
#: bzrlib/bundle/commands.py:77
4271
#: bzrlib/bundle/commands.py:81
4272
msgid "{0}: {1} ({2} multiparent)\n"
4275
#: bzrlib/bundle/commands.py:83
4277
msgid "unique files: %d\n"
4280
#: bzrlib/bundle/commands.py:92
4284
#: bzrlib/bundle/commands.py:93
4289
#: bzrlib/bundle/commands.py:95
4296
#: bzrlib/bundle/commands.py:103
4297
msgid "Decoded contents\n"
4300
#: bzrlib/bundle/serializer/v4.py:327
4302
msgid "Bundling %d revision."
4303
msgid_plural "Bundling %d revisions."
4307
#: bzrlib/bzrdir.py:486
4309
"making backup of {0}\n"
4313
#: bzrlib/bzrdir.py:509
4314
msgid "renamed {0} to {1}"
4317
#: bzrlib/bzrdir.py:1638
4320
"Source repository format does not support stacking, using format:\n"
4324
#: bzrlib/bzrdir.py:1658
4327
"Source branch format does not support stacking, using format:\n"
4331
#: bzrlib/bzrdir.py:1804
4332
msgid "starting repository conversion"
4335
#: bzrlib/bzrdir.py:2025
4336
msgid "Using default stacking branch {0} at {1}"
4339
#: bzrlib/check.py:108
4343
#: bzrlib/check.py:110
4344
msgid "checking revisions"
4347
#: bzrlib/check.py:112
4348
msgid "checking commit contents"
4351
#: bzrlib/check.py:114
4352
msgid "checking file graphs"
4355
#: bzrlib/check.py:118
4356
msgid "checking branches and trees"
4359
#: bzrlib/check.py:205
4360
msgid "checked repository {0} format {1}"
4363
#: bzrlib/check.py:208
4365
msgid "%6d revisions"
4368
#: bzrlib/check.py:209
4370
msgid "%6d file-ids"
4373
#: bzrlib/check.py:211
4375
msgid "%6d unreferenced text versions"
4378
#: bzrlib/check.py:215
4379
msgid "unreferenced version: {{{0}}} in {1}"
4382
#: bzrlib/check.py:218
4384
msgid "%6d revisions are missing inventory_sha1"
4387
#: bzrlib/check.py:221
4389
msgid "%6d revisions are mentioned but not present"
4392
#: bzrlib/check.py:224
4394
msgid "%6d ghost revisions"
4397
#: bzrlib/check.py:229
4399
msgid "%6d revisions missing parents in ancestry"
4402
#: bzrlib/check.py:233
4404
msgid " %s should be in the ancestry for:"
4407
#: bzrlib/check.py:237
4409
msgid "%6d inconsistent parents"
4412
#: bzrlib/check.py:241
4413
msgid " * {0} version {1} has parents {2!r} but should have {3!r}"
4416
#: bzrlib/check.py:247
4418
msgid "%6d revisions have incorrect parents in the revision index"
4421
#: bzrlib/check.py:253
4422
msgid " {0} has wrong parents in index: {1!r} should be {2!r}"
4425
#: bzrlib/check.py:267
4426
msgid "Mismatched internal revid {{{0}}} and index revid {{{1}}}"
4429
#: bzrlib/check.py:296
4431
"Multiple expected sha1s for {0}. {{{1}}} expects {{{2}}}, {{{3}}} expects "
4435
#: bzrlib/check.py:354
4437
msgid "Checking branch at '%s'."
4440
#: bzrlib/check.py:374
4442
msgid "Checking working tree at '%s'."
4445
#: bzrlib/check.py:427 bzrlib/check.py:441
4446
msgid "No branch found at specified location."
4449
#: bzrlib/check.py:429 bzrlib/check.py:439
4450
msgid "No working tree found at specified location."
4453
#: bzrlib/check.py:432
4455
msgid "Checking repository at '%s'."
4458
#: bzrlib/check.py:443
4459
msgid "No repository found at specified location."
4462
#: bzrlib/clean_tree.py:63
4463
msgid "Nothing to delete."
4466
#: bzrlib/clean_tree.py:68
4467
msgid "Are you sure you wish to delete these"
4470
#: bzrlib/clean_tree.py:70
4474
#: bzrlib/clean_tree.py:107
4476
msgid "unable to remove %s"
4479
#: bzrlib/clean_tree.py:111
4480
msgid "deleting paths:"
4483
#: bzrlib/clean_tree.py:125
4484
msgid "unable to remove \"{0}\": {1}."
4487
#: bzrlib/clean_tree.py:130
4488
msgid "No files deleted."
4491
#: bzrlib/cmd_version_info.py:47
4492
msgid "No known version info format {0}. Supported types are: {1}"
4495
#: bzrlib/cmd_version_info.py:52
4496
msgid "Version info in Custom template-based format."
4499
#: bzrlib/cmd_version_info.py:52
4500
msgid "Version info in Python format."
4503
#: bzrlib/cmd_version_info.py:52
4504
msgid "Version info in RIO (simple text) format (default)."
4507
#: bzrlib/cmd_version_info.py:53
4508
msgid "Show version information about this tree."
4511
#: bzrlib/cmd_version_info.py:55
4513
"You can use this command to add information about version into\n"
4514
"source code of an application. The output can be in one of the\n"
4515
"supported formats or in a custom format based on a template."
4518
#: bzrlib/cmd_version_info.py:59 en/help_topics/configuration.txt:700
4519
#: en/help_topics/configuration.txt:710
4520
msgid "For example::"
4523
#: bzrlib/cmd_version_info.py:61
4525
" bzr version-info --custom \\\n"
4526
" --template=\"#define VERSION_INFO \\\"Project 1.2.3 (r{revno})\\\"\\n\""
4529
#: bzrlib/cmd_version_info.py:64
4531
"will produce a C header file with formatted string containing the\n"
4532
"current revision number. Other supported variables in templates are:"
4535
#: bzrlib/cmd_version_info.py:67
4537
" * {date} - date of the last revision\n"
4538
" * {build_date} - current date\n"
4539
" * {revno} - revision number\n"
4540
" * {revision_id} - revision id\n"
4541
" * {branch_nick} - branch nickname\n"
4542
" * {clean} - 0 if the source tree contains uncommitted changes,\n"
4546
#: bzrlib/cmd_version_info.py:77
4547
msgid "Select the output format."
4550
#: bzrlib/cmd_version_info.py:81
4551
msgid "Include all possible information."
4554
#: bzrlib/cmd_version_info.py:82
4555
msgid "Check if tree is clean."
4558
#: bzrlib/cmd_version_info.py:84
4559
msgid "Include the revision-history."
4562
#: bzrlib/cmd_version_info.py:86
4563
msgid "Include the last revision for each file."
4566
#: bzrlib/cmd_version_info.py:87
4567
msgid "Template for the output."
4570
#: bzrlib/cmd_version_info.py:101
4571
msgid "bzr version-info --revision takes exactly one revision specifier"
4574
#: bzrlib/commands.py:229
4576
msgid "unknown command \"%s\""
4579
#: bzrlib/commands.py:476
4580
msgid "No help for this command."
4583
#: bzrlib/commands.py:489
4585
msgid ":Purpose: %s\n"
4588
#: bzrlib/commands.py:491
4595
#: bzrlib/commands.py:493
4597
msgid ":Usage: %s\n"
4600
#: bzrlib/commands.py:512
4605
#: bzrlib/commands.py:523
4613
#: bzrlib/commands.py:533
4616
"See bzr help %s for more details and examples.\n"
4620
#: bzrlib/commands.py:538
4624
#: bzrlib/commands.py:542
4626
msgid ":From: plugin \"%s\"\n"
4629
#: bzrlib/commands.py:554
4630
msgid ":doc:`{0} <{1}-help>`"
4633
#: bzrlib/commands.py:558
4635
msgid ":See also: %s"
4638
#: bzrlib/commands.py:826 bzrlib/gpg.py:347
4639
msgid "Only ASCII permitted in option names"
4642
#: bzrlib/commands.py:851 bzrlib/commands.py:859
4643
msgid "command {0!r} needs one or more {1}"
4646
#: bzrlib/commands.py:868
4647
msgid "command {0!r} requires argument {1}"
4650
#: bzrlib/commands.py:875
4651
msgid "extra argument to command {0}: {1}"
4654
#: bzrlib/commands.py:972
4656
msgid "Profile data written to \"%s\"."
4659
#: bzrlib/commit.py:117 bzrlib/commit.py:740
4663
#: bzrlib/commit.py:117 bzrlib/commit.py:748
4667
#: bzrlib/commit.py:131
4669
msgid "Committing%s"
4672
#: bzrlib/commit.py:134
4674
msgid "Committed revision %d."
4677
#: bzrlib/commit.py:143
4682
#: bzrlib/commit.py:146
4687
#: bzrlib/commit.py:511
4689
"Conflicting tags in bound branch:\n"
4693
#: bzrlib/commit.py:742
4697
#: bzrlib/commit.py:976
4701
#: bzrlib/commit.py:998
4702
msgid "{0} [{1}] - Stage"
4705
#: bzrlib/commit.py:1001
4710
#: bzrlib/commit_signature_commands.py:34
4711
msgid "Sign all commits by a given committer."
4714
#: bzrlib/commit_signature_commands.py:36
4716
"If location is not specified the local tree is used.\n"
4717
"If committer is not specified the default committer is used."
4720
#: bzrlib/commit_signature_commands.py:39
4721
msgid "This does not sign commits that already have signatures."
4724
#: bzrlib/commit_signature_commands.py:47
4726
"Don't actually sign anything, just print the revisions that would be signed."
4729
#: bzrlib/commit_signature_commands.py:98
4731
msgid "Signed %d revision.\n"
4732
msgid_plural "Signed %d revisions.\n"
4736
#: bzrlib/commit_signature_commands.py:103
4737
msgid "Verify all commit signatures."
4740
#: bzrlib/commit_signature_commands.py:105
4742
"Verifies that all commits in the branch are signed by known GnuPG keys."
4745
#: bzrlib/commit_signature_commands.py:110
4747
"Comma separated list of GPG key patterns which are acceptable for "
4751
#: bzrlib/commit_signature_commands.py:148
4752
msgid "Cannot verify a range of non-revision-history revisions"
4755
#: bzrlib/commit_signature_commands.py:166
4756
msgid "All commits signed with verifiable keys"
4759
#: bzrlib/config.py:436
4760
msgid "Invalid config value for \"{0}\" value {1!r} is not an SI unit."
4763
#: bzrlib/config.py:2451
4764
msgid "{0} is not an SI unit."
4767
#: bzrlib/config.py:2970
4769
"Option {0} in section {1} of {2} was changed from {3} to {4}. The {5} value "
4773
#: bzrlib/config.py:3114
4775
msgid "Invalid '%s', should be of the form 'name=value'"
4778
#: bzrlib/config.py:4004
4779
msgid "Display, set or remove a configuration option."
4782
#: bzrlib/config.py:4006
4783
msgid "Display the active value for a given option."
4786
#: bzrlib/config.py:4008
4788
"If --all is specified, NAME is interpreted as a regular expression and all\n"
4789
"matching options are displayed mentioning their scope. The active value\n"
4790
"that bzr will take into account is the first one displayed for each option."
4793
#: bzrlib/config.py:4012
4794
msgid "If no NAME is given, --all .* is implied."
4797
#: bzrlib/config.py:4014
4799
"Setting a value is achieved by using name=value without spaces. The value\n"
4800
"is set in the most relevant scope and can be checked by displaying the\n"
4804
#: bzrlib/config.py:4026
4805
msgid "Reduce the scope to the specified configuration file."
4808
#: bzrlib/config.py:4030
4809
msgid "Display all the defined values for the matching options."
4812
#: bzrlib/config.py:4032
4813
msgid "Remove the option from the configuration file."
4816
#: bzrlib/conflicts.py:50
4817
msgid "List files with conflicts."
4820
#: bzrlib/conflicts.py:57
4822
"Conflicts normally are listed as short, human-readable messages. If --text\n"
4823
"is supplied, the pathnames of files with text conflicts are listed,\n"
4824
"instead. (This is useful for editing all files with text conflicts.)"
4827
#: bzrlib/conflicts.py:61
4828
msgid "Use bzr resolve when you have fixed a problem."
4831
#: bzrlib/conflicts.py:66
4832
msgid "List paths of files with text conflicts."
4835
#: bzrlib/conflicts.py:85
4836
msgid "Marks the conflict as resolved."
4839
#: bzrlib/conflicts.py:88
4840
msgid "Resolve the conflict preserving the version in the working tree."
4843
#: bzrlib/conflicts.py:91
4844
msgid "Resolve the conflict taking the merged version into account."
4847
#: bzrlib/conflicts.py:98
4848
msgid "How to resolve the conflict."
4851
#: bzrlib/conflicts.py:104
4852
msgid "Mark a conflict as resolved."
4855
#: bzrlib/conflicts.py:111
4857
"Once you have fixed a problem, use \"bzr resolve\" to automatically mark\n"
4858
"text conflicts as fixed, \"bzr resolve FILE\" to mark a specific conflict "
4860
"resolved, or \"bzr resolve --all\" to mark all conflicts as resolved."
4863
#: bzrlib/conflicts.py:119
4864
msgid "Resolve all conflicts in this tree."
4867
#: bzrlib/conflicts.py:126
4868
msgid "If --all is specified, no FILE may be provided"
4871
#: bzrlib/conflicts.py:151
4873
msgid "%d conflict auto-resolved."
4874
msgid_plural "%d conflicts auto-resolved."
4878
#: bzrlib/conflicts.py:154
4879
msgid "Remaining conflicts:"
4882
#: bzrlib/conflicts.py:159
4883
msgid "All conflicts resolved."
4886
#: bzrlib/conflicts.py:168
4887
msgid "{0} conflict resolved, {1} remaining"
4888
msgid_plural "{0} conflicts resolved, {1} remaining"
4892
#: bzrlib/controldir.py:712
4893
msgid "{0} is{1} redirected to {2}"
4896
#: bzrlib/diff.py:399
4898
msgid "*** Ignoring files outside view. View is %s"
4901
#: bzrlib/errors.py:157
4902
msgid "The tree builder is already building a tree."
4905
#: bzrlib/errors.py:178
4906
msgid "The dirstate file (%(state)s) appears to be corrupt: %(msg)s"
4909
#: bzrlib/errors.py:197
4911
"The API for \"%(api)s\" is not compatible with \"%(wanted)s\". It supports "
4912
"versions \"%(minimum)s\" to \"%(current)s\"."
4915
#: bzrlib/errors.py:209
4916
msgid "The transport '%(transport)s' is only accessible within this process."
4919
#: bzrlib/errors.py:227
4920
msgid "Invalid revision number %(revno)s"
4923
#: bzrlib/errors.py:236
4924
msgid "Invalid revision-id {%(revision_id)s} in %(branch)s"
4927
#: bzrlib/errors.py:247
4928
msgid "Reserved revision-id {%(revision_id)s}"
4931
#: bzrlib/errors.py:261
4932
msgid "There is no public branch set for \"%(branch_url)s\"."
4935
#: bzrlib/errors.py:271
4937
"No help could be found for '%(topic)s'. Please use 'bzr help topics' to "
4938
"obtain a list of topics."
4941
#: bzrlib/errors.py:280
4942
msgid "The file id \"%(file_id)s\" is not present in the tree %(tree)s."
4945
#: bzrlib/errors.py:290
4947
"The file id \"%(file_id)s\" is not present in the repository %(repository)r"
4950
#: bzrlib/errors.py:299
4951
msgid "The branch '%(branch)s' is not stacked."
4954
#: bzrlib/errors.py:313
4955
msgid "No WorkingTree exists for \"%(base)s\"."
4958
#: bzrlib/errors.py:322
4959
msgid "Not currently building a tree."
4962
#: bzrlib/errors.py:327
4963
msgid "%(url)s is not a local path."
4966
#: bzrlib/errors.py:355
4967
msgid "%(not_locked)r is not write locked but needs to be."
4970
#: bzrlib/errors.py:363
4971
msgid "Error in command line options"
4974
#: bzrlib/errors.py:368
4975
msgid "%(value)s is not an index of type %(_type)s."
4978
#: bzrlib/errors.py:378
4979
msgid "Error in data for index %(value)s."
4982
#: bzrlib/errors.py:387
4983
msgid "The key '%(key)s' is already in index '%(index)s'."
4986
#: bzrlib/errors.py:397
4987
msgid "The key '%(key)s' is not a valid key."
4990
#: bzrlib/errors.py:406
4991
msgid "Could not parse options for index %(value)s."
4994
#: bzrlib/errors.py:415
4995
msgid "The value '%(value)s' is not a valid value."
4998
#: bzrlib/errors.py:424
4999
msgid "Bad value \"%(value)s\" for option \"%(name)s\"."
5002
#: bzrlib/errors.py:443
5003
msgid "Generic path error: %(path)r%(extra)s)"
5006
#: bzrlib/errors.py:456
5007
msgid "No such file: %(path)r%(extra)s"
5010
#: bzrlib/errors.py:461
5011
msgid "File exists: %(path)r%(extra)s"
5014
#: bzrlib/errors.py:467
5016
"Could not rename %(source)s => %(dest)s because both files exist. (Use --"
5017
"after to tell bzr about a rename that has already happened)%(extra)s"
5020
#: bzrlib/errors.py:483
5021
msgid "\"%(path)s\" is not a directory %(extra)s"
5024
#: bzrlib/errors.py:488
5025
msgid "\"%(path)s\" is not in the working directory %(extra)s"
5028
#: bzrlib/errors.py:493
5029
msgid "Directory not empty: \"%(path)s\"%(extra)s"
5032
#: bzrlib/errors.py:498
5033
msgid "Hard-linking \"%(path)s\" is not supported"
5036
#: bzrlib/errors.py:513
5037
msgid "Device or resource busy: \"%(path)s\"%(extra)s"
5040
#: bzrlib/errors.py:518
5041
msgid "Permission denied: \"%(path)s\"%(extra)s"
5044
#: bzrlib/errors.py:523
5045
msgid "Invalid url supplied to transport: \"%(path)s\"%(extra)s"
5048
#: bzrlib/errors.py:528
5049
msgid "Invalid URL join request: %(reason)s: %(base)r + %(join_args)r"
5052
#: bzrlib/errors.py:539
5053
msgid "URLs differ by more than path: %(from_)r and %(to)r"
5056
#: bzrlib/errors.py:561
5057
msgid "The %(type)s hook '%(hook)s' is unknown in this version of bzrlib."
5060
#: bzrlib/errors.py:571
5061
msgid "Unsupported protocol for url \"%(path)s\"%(extra)s"
5064
#: bzrlib/errors.py:579
5066
"The branch '%(url)s'(%(format)s) is not a stackable format. You will need to "
5067
"upgrade the branch to permit branch stacking."
5070
#: bzrlib/errors.py:590
5071
msgid "The branch '%(branch_url)s' cannot be stacked on '%(target_url)s'."
5074
#: bzrlib/errors.py:600
5076
"The repository '%(url)s'(%(format)s) is not a stackable format. You will "
5077
"need to upgrade the repository to permit branch stacking."
5080
#: bzrlib/errors.py:611
5081
msgid "Error reading from %(path)r."
5084
#: bzrlib/errors.py:630
5085
msgid "Path \"%(path)s\" is not a child of path \"%(base)s\"%(extra)s"
5088
#: bzrlib/errors.py:646
5089
msgid "Path \"%(path)s\" is not unicode normalized"
5092
#: bzrlib/errors.py:654
5093
msgid "Not a branch: \"%(path)s\"%(detail)s."
5096
#: bzrlib/errors.py:696
5097
msgid "No submit branch available for branch \"%(path)s\""
5100
#: bzrlib/errors.py:705
5101
msgid "A control directory already exists: \"%(path)s\"."
5104
#: bzrlib/errors.py:710
5105
msgid "Already a branch: \"%(path)s\"."
5108
#: bzrlib/errors.py:715
5109
msgid "Invalid branch name: %(name)s"
5112
#: bzrlib/errors.py:724
5113
msgid "Parent branch already exists: \"%(path)s\"."
5116
#: bzrlib/errors.py:730
5118
"Directory contains a branch, but no working tree (use bzr checkout if you "
5119
"wish to build a working tree): \"%(path)s\""
5122
#: bzrlib/errors.py:735
5124
"\"%(function)s\" called on an AtomicFile after it was closed: \"%(path)s\""
5127
#: bzrlib/errors.py:745
5129
"Parent not accessible given base \"%(base)s\" and relative path \"%(path)s\""
5132
#: bzrlib/errors.py:755
5133
msgid "No repository present: \"%(path)s\""
5136
#: bzrlib/errors.py:762
5138
"Unsupported branch format: %(format)s\n"
5139
"Please run 'bzr upgrade'"
5142
#: bzrlib/errors.py:768
5143
msgid "Unknown %(kind)s format: %(format)r"
5146
#: bzrlib/errors.py:777
5147
msgid "Format %(format)s is not compatible with .bzr version %(bzrdir)s."
5150
#: bzrlib/errors.py:787
5151
msgid "Parse error on line %(lineno)d of %(format)s format: %(line)s"
5154
#: bzrlib/errors.py:802
5157
"is not compatible with\n"
5162
#: bzrlib/errors.py:818
5163
msgid "Revision is not compatible with %(repo_format)s"
5166
#: bzrlib/errors.py:828
5167
msgid "%(context_info)s%(path)s is already versioned."
5170
#: bzrlib/errors.py:849
5171
msgid "%(context_info)s%(path)s is not versioned."
5174
#: bzrlib/errors.py:870
5175
msgid "Path(s) are not versioned: %(paths_as_string)s"
5178
#: bzrlib/errors.py:881
5179
msgid "Path(s) do not exist: %(paths_as_string)s%(extra)s"
5182
#: bzrlib/errors.py:900
5183
msgid "Cannot operate on \"%(filename)s\" of unsupported kind \"%(kind)s\""
5186
#: bzrlib/errors.py:908
5188
"Filename %(filename)r is not valid in your current filesystem encoding "
5192
#: bzrlib/errors.py:919
5193
msgid "Cannot operate on \"%(filename)s\" because it is a control file"
5196
#: bzrlib/errors.py:937
5197
msgid "The lock for '%(lock_description)s' is in use and cannot be broken."
5200
#: bzrlib/errors.py:976
5201
msgid "Cannot lock %(lock)s: %(why)s"
5204
#: bzrlib/errors.py:986
5206
"A transaction related operation was attempted after the transaction finished."
5209
#: bzrlib/errors.py:1013
5210
msgid "Cannot lock: transport is read only: %(transport)s"
5213
#: bzrlib/errors.py:1021
5214
msgid "Could not acquire lock \"%(lock)s\": %(msg)s"
5217
#: bzrlib/errors.py:1032
5219
"Lock was broken while still open: %(lock)s - check storage consistency!"
5222
#: bzrlib/errors.py:1043
5224
"Lock was released and re-acquired before being broken: %(lock)s: held by "
5225
"%(holder)r, wanted to break %(target)r"
5228
#: bzrlib/errors.py:1055
5230
"Lock is apparently held, but corrupted: %(corruption_info)s\n"
5231
"Use 'bzr break-lock' to clear it"
5234
#: bzrlib/errors.py:1068
5235
msgid "Lock not held: %(lock)s"
5238
#: bzrlib/errors.py:1097
5239
msgid "No changes to commit"
5242
#: bzrlib/errors.py:1102
5244
"Selected-file commit of merges is not supported yet: files %(files_str)s"
5247
#: bzrlib/errors.py:1112
5249
"Excluding paths during commit is not supported by repository at "
5253
#: bzrlib/errors.py:1121
5255
"The specified commit message contains characters unsupported by the current "
5259
#: bzrlib/errors.py:1127
5260
msgid "Upgrade URL cannot work with readonly URLs."
5263
#: bzrlib/errors.py:1132
5264
msgid "The branch format %(format)s is already at the most recent format."
5267
#: bzrlib/errors.py:1155
5268
msgid "Option --change does not accept revision ranges"
5271
#: bzrlib/errors.py:1160
5272
msgid "No namespace registered for string: %(spec)r"
5275
#: bzrlib/errors.py:1179
5277
"Requested revision: '%(spec)s' does not exist in branch: "
5278
"%(branch_url)s%(extra)s"
5281
#: bzrlib/errors.py:1193
5283
"Operation denied because it would change the main history, which is not "
5284
"permitted by the append_revisions_only setting on branch \"%(location)s\"."
5287
#: bzrlib/errors.py:1204
5289
"These branches have diverged. Use the missing command to see how.\n"
5290
"Use the merge command to reconcile them."
5293
#: bzrlib/errors.py:1224
5295
"Branches have no common ancestor, and no merge base revision was specified."
5298
#: bzrlib/errors.py:1230
5300
"Selected merge cannot perform reverse cherrypicks. Try merge3 or diff3."
5303
#: bzrlib/errors.py:1236
5304
msgid "Revisions have no common ancestor: %(revision_a)s %(revision_b)s"
5307
#: bzrlib/errors.py:1245
5309
"Revisions are not derived from the same root: %(revision_a)s %(revision_b)s."
5312
#: bzrlib/errors.py:1254
5313
msgid "Revision %(rev_id)s is not an ancestor of %(not_ancestor_id)s"
5316
#: bzrlib/errors.py:1263
5317
msgid "Branch %(branch)s has no commits."
5320
#: bzrlib/errors.py:1281
5322
"Bound branch %(branch)s is out of date with master branch "
5323
"%(master)s.%(extra_help)s"
5326
#: bzrlib/errors.py:1293
5328
"Cannot commit to branch %(branch)s. It is bound to %(master)s, which is "
5329
"bound to %(remote)s."
5332
#: bzrlib/errors.py:1305
5333
msgid "Cannot pull --overwrite to a branch which is bound %(branch)s"
5336
#: bzrlib/errors.py:1314
5338
"Unable to connect to target of bound branch %(branch)s => %(target)s: "
5342
#: bzrlib/errors.py:1326
5343
msgid "Error in processing weave: %(msg)s"
5346
#: bzrlib/errors.py:1335
5347
msgid "Revision {%(revision_id)s} already present in %(weave)s"
5350
#: bzrlib/errors.py:1346
5351
msgid "Revision {%(revision_id)s} not present in %(weave)s"
5354
#: bzrlib/errors.py:1356
5355
msgid "Weave invariant violated: %(what)s"
5358
#: bzrlib/errors.py:1365
5359
msgid "Parents are mismatched between two revisions. %(msg)s"
5362
#: bzrlib/errors.py:1387
5364
"Weaves differ on text content. Revision: {%(revision_id)s}, %(weave_a)s, "
5368
#: bzrlib/errors.py:1399
5369
msgid "Versioned file error"
5372
#: bzrlib/errors.py:1404
5373
msgid "Revision {%(revision_id)s} not present in \"%(file_id)s\"."
5376
#: bzrlib/errors.py:1414
5377
msgid "Revision {%(revision_id)s} already present in \"%(file_id)s\"."
5380
#: bzrlib/errors.py:1424
5381
msgid "Text did not match its checksum: %(msg)s"
5384
#: bzrlib/errors.py:1550
5385
msgid "Export format %(format)r not supported"
5388
#: bzrlib/errors.py:1559
5389
msgid "Transport error: %(msg)s %(orig_error)s"
5392
#: bzrlib/errors.py:1585
5393
msgid "Generic bzr smart protocol error: %(details)s"
5396
#: bzrlib/errors.py:1593
5397
msgid "Received bad protocol version marker: %(marker)r"
5400
#: bzrlib/errors.py:1625
5401
msgid "Transport operation not possible: %(msg)s %(orig_error)s"
5404
#: bzrlib/errors.py:1630
5405
msgid "Connection error: %(msg)s %(orig_error)s"
5408
#: bzrlib/errors.py:1635
5409
msgid "%(msg)s %(host)s%(port)s%(orig_error)s"
5412
#: bzrlib/errors.py:1656
5413
msgid "Connection closed: %(msg)s %(orig_error)s"
5416
#: bzrlib/errors.py:1661
5417
msgid "Connection Timeout: %(msg)s%(orig_error)s"
5420
#: bzrlib/errors.py:1666
5421
msgid "Invalid range access in %(path)s at %(offset)s: %(msg)s"
5424
#: bzrlib/errors.py:1676
5425
msgid "Invalid http response for %(path)s: %(msg)s%(orig_error)s"
5428
#: bzrlib/errors.py:1691
5429
msgid "Certificate error: %(error)s"
5432
#: bzrlib/errors.py:1699
5433
msgid "Invalid http range %(range)r for %(path)s: %(msg)s"
5436
#: bzrlib/errors.py:1713
5437
msgid "HTTP MIME Boundary missing for %(path)s: %(msg)s"
5440
#: bzrlib/errors.py:1721
5441
msgid "Invalid http Content-type \"%(ctype)s\" for %(path)s: %(msg)s"
5444
#: bzrlib/errors.py:1730
5445
msgid "%(source)s is%(permanently)s redirected to %(target)s"
5448
#: bzrlib/errors.py:1744
5449
msgid "Too many redirections"
5452
#: bzrlib/errors.py:1749
5453
msgid "Working tree has conflicts."
5456
#: bzrlib/errors.py:1753
5457
msgid "Config file %(filename)s is not UTF-8 encoded\n"
5460
#: bzrlib/errors.py:1762
5462
"Error(s) parsing config file %(filename)s:\n"
5466
#: bzrlib/errors.py:1772
5468
"Bad value \"%(value)s\" for option \"%(name)s\".\n"
5469
"See ``bzr help %(name)s``"
5472
#: bzrlib/errors.py:1782
5473
msgid "%(username)r does not seem to contain a reasonable email address"
5476
#: bzrlib/errors.py:1791
5477
msgid "Failed to GPG sign data with command \"%(command_line)s\""
5480
#: bzrlib/errors.py:1799
5481
msgid "Failed to verify GPG signature data with error \"%(error)s\""
5484
#: bzrlib/errors.py:1807
5485
msgid "Unable to import library \"%(library)s\": %(error)s"
5488
#: bzrlib/errors.py:1815
5489
msgid "python-gpgme is not installed, it is needed to verify signatures"
5492
#: bzrlib/errors.py:1823
5494
"The working tree for %(basedir)s has changed since the last commit, but "
5495
"weave merge requires that it be unchanged"
5498
#: bzrlib/errors.py:1833
5500
"Can't reprocess and show base, because reprocessing obscures the "
5501
"relationship of conflicting lines to the base"
5504
#: bzrlib/errors.py:1839
5505
msgid "Cycle in graph %(graph)r"
5508
#: bzrlib/errors.py:1867
5509
msgid "File %(filename)s is not conflicted."
5512
#: bzrlib/errors.py:1889
5513
msgid "No bundle was found in \"%(filename)s\"."
5516
#: bzrlib/errors.py:1898
5517
msgid "Unable to handle bundle version %(version)s: %(msg)s"
5520
#: bzrlib/errors.py:1908
5521
msgid "Branch %(base)s is missing revision %(text_revision)s of %(file_id)s"
5524
#: bzrlib/errors.py:1921
5525
msgid "File id {%(file_id)s} already exists in inventory as %(entry)s"
5528
#: bzrlib/errors.py:1931
5529
msgid "Key %(key)s is already present in map"
5532
#: bzrlib/errors.py:1936
5533
msgid "The prefix %(prefix)s is in the help search path twice."
5536
#: bzrlib/errors.py:1946
5538
"No final name for trans_id %(trans_id)r\n"
5539
"file-id: %(file_id)r\n"
5540
"root trans-id: %(root_trans_id)r\n"
5543
#: bzrlib/errors.py:1978
5544
msgid "Attempt to reuse a transform that has already been applied."
5547
#: bzrlib/errors.py:1983
5548
msgid "Moving the root directory is not supported at this time"
5551
#: bzrlib/errors.py:1988
5552
msgid "Failed to rename %(from_path)s to %(to_path)s: %(why)s"
5555
#: bzrlib/errors.py:1999
5557
"Could not move %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s"
5560
#: bzrlib/errors.py:2035
5562
"Could not rename %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s"
5565
#: bzrlib/errors.py:2065
5566
msgid "Unable to import paramiko (required for sftp support): %(error)s"
5569
#: bzrlib/errors.py:2073
5570
msgid "Nothing to merge."
5573
#: bzrlib/errors.py:2078
5574
msgid "Format %(format)s cannot be initialised by this version of bzr."
5577
#: bzrlib/errors.py:2087
5579
"Cannot convert from format %(from_format)s to format %(format)s. "
5583
#: bzrlib/errors.py:2099
5584
msgid "Could not find an appropriate Differ for file \"%(path)s\""
5587
#: bzrlib/errors.py:2107
5588
msgid "%(exe_name)s could not be found on this machine"
5591
#: bzrlib/errors.py:2115
5592
msgid "Diff is not installed on this machine: %(msg)s"
5595
#: bzrlib/errors.py:2123
5596
msgid "Diff3 is not installed on this machine."
5599
#: bzrlib/errors.py:2129
5600
msgid "The content being inserted is already present."
5603
#: bzrlib/errors.py:2134
5605
"This tree contains left-over files from a failed operation.\n"
5606
" Please examine %(limbo_dir)s to see if it contains any files you wish "
5608
" keep, and delete it when you are done."
5611
#: bzrlib/errors.py:2145
5613
"This tree contains left-over files from a failed operation.\n"
5614
" Please examine %(pending_deletion)s to see if it contains any files you\n"
5615
" wish to keep, and delete it when you are done."
5618
#: bzrlib/errors.py:2155
5620
"Unable to delete transform temporary directory %(limbo_dir)s.\n"
5621
" Please examine %(limbo_dir)s to see if it contains any files you wish "
5623
" keep, and delete it when you are done."
5626
#: bzrlib/errors.py:2166
5628
"Unable to delete transform temporary directory %(pending_deletion)s. Please "
5629
"examine %(pending_deletion)s to see if it contains any files you wish to "
5630
"keep, and delete it when you are done."
5633
#: bzrlib/errors.py:2176
5634
msgid "Working tree is out of date, please run 'bzr update'.%(more)s"
5637
#: bzrlib/errors.py:2190
5639
"Public branch \"%(public_location)s\" lacks revision \"%(revstring)s\"."
5642
#: bzrlib/errors.py:2203
5643
msgid "Error in merge modified format"
5646
#: bzrlib/errors.py:2208
5647
msgid "Format error in conflict listings"
5650
#: bzrlib/errors.py:2212
5652
"Inconsistency in dirstate file %(dirstate_path)s.\n"
5653
"Error: %(description)s"
5656
#: bzrlib/errors.py:2223
5658
"An error has been detected in the repository %(repo_path)s.\n"
5659
"Please run bzr reconcile on this repository."
5662
#: bzrlib/errors.py:2234
5664
"An inconsistent delta was supplied involving %(path)r, %(file_id)r\n"
5665
"reason: %(reason)s"
5668
#: bzrlib/errors.py:2247
5670
"An inconsistent delta was supplied: %(delta)r\n"
5671
"reason: %(reason)s"
5674
#: bzrlib/errors.py:2259
5675
msgid "To use this feature you must upgrade your branch at %(path)s."
5678
#: bzrlib/errors.py:2268
5679
msgid "To use this feature you must upgrade your repository at %(path)s."
5682
#: bzrlib/errors.py:2273
5684
"To use this feature you must upgrade your branch at %(path)s to a format "
5685
"which supports rich roots."
5688
#: bzrlib/errors.py:2279
5689
msgid "Cannot perform local-only commits on unbound branches."
5692
#: bzrlib/errors.py:2284
5693
msgid "The method %(mname)s is not supported on objects of type %(tname)s."
5696
#: bzrlib/errors.py:2305
5697
msgid "Ghost tags not supported by format %(format)r."
5700
#: bzrlib/errors.py:2313
5701
msgid "File is binary but should be text."
5704
#: bzrlib/errors.py:2318
5705
msgid "The path %(path)s is not permitted on this platform"
5708
#: bzrlib/errors.py:2327
5710
"Testament did not match expected value.\n"
5711
" For revision_id {%(revision_id)s}, expected {%(expected)s}, measured\n"
5715
#: bzrlib/errors.py:2339
5716
msgid "Not a bzr revision-bundle: %(text)r"
5719
#: bzrlib/errors.py:2348
5720
msgid "Bad bzr revision-bundle: %(text)r"
5723
#: bzrlib/errors.py:2357
5724
msgid "Malformed bzr revision-bundle header: %(text)r"
5727
#: bzrlib/errors.py:2362
5728
msgid "Malformed patches in bzr revision-bundle: %(text)r"
5731
#: bzrlib/errors.py:2367
5732
msgid "Malformed footer in bzr revision-bundle: %(text)r"
5735
#: bzrlib/errors.py:2372
5736
msgid "End of line marker was not \\n in bzr revision-bundle"
5739
#: bzrlib/errors.py:2382
5740
msgid "Bundle format %(bundle_format)s is incompatible with %(other)s"
5743
#: bzrlib/errors.py:2392
5744
msgid "Root class for inventory serialization errors"
5747
#: bzrlib/errors.py:2396
5749
"The inventory was not in the expected format:\n"
5753
#: bzrlib/errors.py:2405
5754
msgid "This operation requires rich root data storage"
5757
#: bzrlib/errors.py:2418
5758
msgid "Unrecognised value for BZR_SSH environment variable: %(vendor)s"
5761
#: bzrlib/errors.py:2427
5763
"Don't know how to handle SSH connections. Please set BZR_SSH environment "
5767
#: bzrlib/errors.py:2434
5769
"Could not determine revno for {%(revision_id)s} because its ancestry shows a "
5770
"ghost at {%(ghost_revision_id)s}"
5773
#: bzrlib/errors.py:2444
5774
msgid "Ghost revision {%(revision_id)s} cannot be used here."
5777
#: bzrlib/errors.py:2495
5779
"A merge directive must provide either a bundle or a public branch location."
5782
#: bzrlib/errors.py:2502
5783
msgid "Bad merge directive payload %(start)r"
5786
#: bzrlib/errors.py:2512
5787
msgid "Preview patch does not match requested changes."
5790
#: bzrlib/errors.py:2518
5791
msgid "Patch_type was %(patch_type)s, but no patch was supplied."
5794
#: bzrlib/errors.py:2528
5796
"Your branch does not have all of the revisions required in order to merge "
5797
"this merge directive and the target location specified in the merge "
5798
"directive is not a branch: %(location)s."
5801
#: bzrlib/errors.py:2540
5802
msgid "Unsupported entry kind %(kind)s"
5805
#: bzrlib/errors.py:2548
5806
msgid "Can't subsume %(other_tree)s into %(tree)s. %(reason)s"
5809
#: bzrlib/errors.py:2558
5810
msgid "Subsume target %(other_tree)s needs to be upgraded."
5813
#: bzrlib/errors.py:2577
5814
msgid "No such tag: %(tag_name)s"
5817
#: bzrlib/errors.py:2585
5818
msgid "Tags not supported by %(branch)s; you may be able to use bzr upgrade."
5821
#: bzrlib/errors.py:2594
5822
msgid "Tag %(tag_name)s already exists."
5825
#: bzrlib/errors.py:2602
5827
"Did not understand bug identifier %(bug_id)s: %(reason)s. See \"bzr help "
5828
"bugs\" for more information on this feature."
5831
#: bzrlib/errors.py:2612
5833
"The URL for bug tracker \"%(abbreviation)s\" doesn't contain {id}: %(url)s"
5836
#: bzrlib/errors.py:2622
5838
"Cannot find registered bug tracker called %(abbreviation)s on %(branch)s"
5841
#: bzrlib/errors.py:2632
5842
msgid "Invalid line in bugs property: '%(line)s'"
5845
#: bzrlib/errors.py:2640
5846
msgid "Invalid bug status: '%(status)s'"
5849
#: bzrlib/errors.py:2648
5850
msgid "Could not understand response from smart server: %(response_tuple)r"
5853
#: bzrlib/errors.py:2687
5854
msgid "Server sent an unexpected error: %(error_tuple)r"
5857
#: bzrlib/errors.py:2706
5858
msgid "Unrecognised container format: %(container_format)r"
5861
#: bzrlib/errors.py:2714
5862
msgid "Unexpected end of container stream"
5865
#: bzrlib/errors.py:2719
5866
msgid "Unknown record type: %(record_type)r"
5869
#: bzrlib/errors.py:2727
5870
msgid "Invalid record: %(reason)s"
5873
#: bzrlib/errors.py:2735
5874
msgid "Container has data after end marker: %(excess)r"
5877
#: bzrlib/errors.py:2743
5878
msgid "Container has multiple records with the same name: %(name)s"
5881
#: bzrlib/errors.py:2756
5882
msgid "Corrupt or incompatible data stream: %(reason)s"
5885
#: bzrlib/errors.py:2764
5886
msgid "SMTP error: %(error)s"
5889
#: bzrlib/errors.py:2772
5890
msgid "No message supplied."
5893
#: bzrlib/errors.py:2777
5894
msgid "No mail-to address (--mail-to) or output (-o) specified."
5897
#: bzrlib/errors.py:2782
5899
"Unable to find mail client with the following names: "
5900
"%(mail_command_list_string)s"
5903
#: bzrlib/errors.py:2792
5904
msgid "SMTP connection to %(host)s refused"
5907
#: bzrlib/errors.py:2801
5908
msgid "Please specify smtp_server. No server at default %(host)s."
5911
#: bzrlib/errors.py:2815
5913
"'%(display_url)s' is not in sync with %(target_url)s. See bzr help sync-for-"
5917
#: bzrlib/errors.py:2827
5918
msgid "'%(display_url)s' is already a branch."
5921
#: bzrlib/errors.py:2832
5922
msgid "'%(display_url)s' is already a tree."
5925
#: bzrlib/errors.py:2837
5926
msgid "'%(display_url)s' is already a checkout."
5929
#: bzrlib/errors.py:2842
5930
msgid "'%(display_url)s' is already a lightweight checkout."
5933
#: bzrlib/errors.py:2847
5934
msgid "'%(display_url)s' is already using a shared repository."
5937
#: bzrlib/errors.py:2852
5938
msgid "'%(display_url)s' is already standalone."
5941
#: bzrlib/errors.py:2857
5942
msgid "Shared repository '%(display_url)s' already creates working trees."
5945
#: bzrlib/errors.py:2863
5947
"Shared repository '%(display_url)s' already doesn't create working trees."
5950
#: bzrlib/errors.py:2869
5951
msgid "Requested reconfiguration of '%(display_url)s' is not supported."
5954
#: bzrlib/errors.py:2874
5955
msgid "No location could be found to bind to at %(display_url)s."
5958
#: bzrlib/errors.py:2879
5960
"Working tree \"%(display_url)s\" has uncommitted changes (See bzr "
5964
#: bzrlib/errors.py:2898
5966
"Working tree \"%(display_url)s\" has shelved changes (See bzr shelve --"
5970
#: bzrlib/errors.py:2904
5971
msgid "Variable {%(name)s} is not available."
5974
#: bzrlib/errors.py:2912
5975
msgid "No template specified."
5978
#: bzrlib/errors.py:2917
5979
msgid "Unable to create symlink %(path_str)son this platform"
5982
#: bzrlib/errors.py:2932
5984
"Unsupported timezone format \"%(timezone)s\", options are \"utc\", "
5985
"\"original\", \"local\"."
5988
#: bzrlib/errors.py:2966
5990
"Unable to encode %(kind)s path %(path)r in user encoding %(user_encoding)s"
5993
#: bzrlib/errors.py:2978
5994
msgid "The \"%(config_id)s\" configuration does not exist."
5997
#: bzrlib/errors.py:2986
5998
msgid "The \"%(option_name)s\" configuration option does not exist."
6001
#: bzrlib/errors.py:2994
6002
msgid "The alias \"%(alias_name)s\" does not exist."
6005
#: bzrlib/errors.py:3008
6006
msgid "\"%(alias_name)s\" is not a valid location alias."
6009
#: bzrlib/errors.py:3016
6010
msgid "No %(alias_name)s location assigned."
6013
#: bzrlib/errors.py:3024
6014
msgid "Cannot bind address \"%(host)s:%(port)i\": %(orig_error)s."
6017
#: bzrlib/errors.py:3034
6018
msgid "Unknown rules detected: %(unknowns_str)s."
6021
#: bzrlib/errors.py:3045
6022
msgid "Tip change rejected: %(msg)s"
6025
#: bzrlib/errors.py:3053
6026
msgid "Shelf corrupt."
6029
#: bzrlib/errors.py:3058
6030
msgid "Corruption while decompressing repository file%(orig_error)s"
6033
#: bzrlib/errors.py:3070
6034
msgid "No changes are shelved with id \"%(shelf_id)d\"."
6037
#: bzrlib/errors.py:3078
6038
msgid "\"%(invalid_id)s\" is not a valid shelf id, try a number instead."
6041
#: bzrlib/errors.py:3086
6043
"An attempt to access a url outside the server jail was made: '%(url)s'."
6046
#: bzrlib/errors.py:3094
6047
msgid "The user aborted the operation."
6050
#: bzrlib/errors.py:3099
6051
msgid "Branching '%(url)s'(%(format)s) must create a working tree."
6054
#: bzrlib/errors.py:3109
6055
msgid "No such view: %(view_name)s."
6058
#: bzrlib/errors.py:3119
6060
"Views are not supported by %(tree)s; use 'bzr upgrade' to change your tree "
6061
"to a later format."
6064
#: bzrlib/errors.py:3128
6066
"Specified file \"%(file_name)s\" is outside the current view: %(view_str)s"
6069
#: bzrlib/errors.py:3195
6070
msgid "%(bzrdir)r does not support co-located branches."
6073
#: bzrlib/errors.py:3201
6075
"Unable to determine your name.\n"
6076
"Please, set your name with the 'whoami' command.\n"
6077
"E.g. bzr whoami \"Your Name <name@example.com>\""
6080
#: bzrlib/errors.py:3210
6081
msgid "Invalid pattern(s) found. %(msg)s"
6084
#: bzrlib/errors.py:3218
6086
"Branch \"%(branch_url)s\" appears to be bound to itself. Please use `bzr "
6090
#: bzrlib/errors.py:3229
6091
msgid "Loop involving %(refs)r while expanding \"%(string)s\"."
6094
#: bzrlib/errors.py:3238
6095
msgid "Option %(name)s is not defined while expanding \"%(string)s\"."
6098
#: bzrlib/errors.py:3247
6100
"No compatible object available for operations from %(source)r to %(target)r."
6103
#: bzrlib/errors.py:3257
6105
"VFS requests over the smart server are not allowed. Encountered: %(method)s, "
6109
#: bzrlib/errors.py:3267
6111
"Kind change from %(from_kind)s to %(to_kind)s for %(path)s not supported by "
6115
#: bzrlib/errors.py:3279
6117
"Missing feature %(feature)s not provided by this version of Bazaar or any "
6121
#: bzrlib/errors.py:3292
6122
msgid "Binary files section encountered."
6125
#: bzrlib/errors.py:3300
6127
"Malformed patch header. %(desc)s\n"
6131
#: bzrlib/errors.py:3309
6133
"Malformed hunk header. %(desc)s\n"
6137
#: bzrlib/errors.py:3318
6139
"Malformed line. %(desc)s\n"
6143
#: bzrlib/errors.py:3328
6145
"Text contents mismatch at line %(line_no)d. Original has \"%(orig_line)s\", "
6146
"but patch says it should be \"%(patch_line)s\""
6149
#: bzrlib/errors.py:3339
6150
msgid "The feature %(feature)s has already been registered."
6153
#: bzrlib/export_pot.py:252
6155
msgid "Exporting messages from builtin command: %s"
6158
#: bzrlib/export_pot.py:271
6159
msgid "Exporting messages from plugin command: {0} in {1}"
6162
#: bzrlib/export_pot.py:292
6164
msgid "Exporting message from error: %s"
6167
#: bzrlib/fetch.py:98
6168
msgid "Finding revisions"
6171
#: bzrlib/fetch.py:103
6172
msgid "Fetching revisions"
6175
#: bzrlib/foreign.py:262
6176
msgid "Push into a different VCS without any custom bzr metadata."
6179
#: bzrlib/foreign.py:264
6181
"This will afterwards rebase the local branch on the remote\n"
6182
"branch unless the --no-rebase option is used, in which case \n"
6183
"the two branches will be out of sync after the push. "
6186
#: bzrlib/foreign.py:277
6187
msgid "Do not rebase after push."
6190
#: bzrlib/foreign.py:311
6192
msgid "Using saved location: %s\n"
6195
#: bzrlib/foreign.py:321
6197
"{0!r} and {1!r} are in the same VCS, lossy push not necessary. Please use "
6201
#: bzrlib/gpg.py:366
6202
msgid "No GnuPG key results for pattern: {0}"
6205
#: bzrlib/gpg.py:439
6206
msgid "{0} commits with valid signatures"
6209
#: bzrlib/gpg.py:445
6210
msgid "{0} commit with unknown key"
6211
msgid_plural "{0} commits with unknown keys"
6215
#: bzrlib/gpg.py:453
6216
msgid "{0} commit not valid"
6217
msgid_plural "{0} commits not valid"
6221
#: bzrlib/gpg.py:461
6222
msgid "{0} commit not signed"
6223
msgid_plural "{0} commits not signed"
6227
#: bzrlib/gpg.py:469
6228
msgid "{0} commit with key now expired"
6229
msgid_plural "{0} commits with key now expired"
6233
#: bzrlib/gpg.py:489
6234
msgid "{0} commit by author {1} with key {2} now expired"
6235
msgid_plural "{0} commits by author {1} with key {2} now expired"
6239
#: bzrlib/gpg.py:505
6240
msgid "{0} signed {1} commit"
6241
msgid_plural "{0} signed {1} commits"
6245
#: bzrlib/gpg.py:522 bzrlib/gpg.py:539
6246
msgid "{0} commit by author {1}"
6247
msgid_plural "{0} commits by author {1}"
6251
#: bzrlib/gpg.py:554
6252
msgid "Unknown key {0} signed {1} commit"
6253
msgid_plural "Unknown key {0} signed {1} commits"
6257
#: bzrlib/groupcompress.py:1739
6259
msgid "Insert claimed random_id=True, but then inserted %r two times"
6262
#: bzrlib/hooks.py:313
6264
msgid "Introduced in: %s"
6267
#: bzrlib/hooks.py:316
6269
msgid "Deprecated in: %s"
6272
#: bzrlib/knit.py:1766 bzrlib/knit.py:1802
6273
msgid "Walking content"
6276
#: bzrlib/knit.py:3330
6280
#: bzrlib/lock.py:548
6281
msgid "{0!r} was {1} locked again"
6284
#: bzrlib/lockdir.py:321
6286
msgid "error removing pending lock: %s"
6289
#: bzrlib/lockdir.py:616
6290
msgid "Unable to obtain"
6293
#: bzrlib/lockdir.py:618
6294
msgid "Lock owner changed for"
6297
#: bzrlib/lockdir.py:620
6298
msgid "{0} lock {1} {2}."
6301
#: bzrlib/lockdir.py:627
6303
msgid "Will continue to try until %s, unless you press Ctrl-C."
6306
#: bzrlib/lockdir.py:629
6307
msgid "See \"bzr help break-lock\" for more."
6310
#: bzrlib/lockdir.py:739
6313
"held by %(user)s on %(hostname)s (process #%(pid)s), acquired %(time_ago)s"
6316
#: bzrlib/log.py:563
6317
msgid "--exclude-common-ancestry requires two different revisions"
6320
#: bzrlib/log.py:565
6322
msgid "invalid direction %r"
6325
#: bzrlib/log.py:653
6326
msgid "Start revision not found in history of end revision."
6329
#: bzrlib/log.py:1071 bzrlib/log.py:1129
6330
msgid "Logging revision 0 is invalid."
6333
#: bzrlib/log.py:1073 bzrlib/log.py:1131
6334
msgid "Start revision must be older than the end revision."
6337
#: bzrlib/log.py:1818
6339
msgid "unknown log formatter: %r"
6342
#: bzrlib/log.py:2114
6344
msgid_plural "fixes bugs"
6348
#: bzrlib/merge.py:689
6349
msgid "All changes applied successfully."
6352
#: bzrlib/merge.py:691
6354
msgid "%d conflicts encountered."
6357
#: bzrlib/merge.py:845 bzrlib/merge.py:1868
6358
msgid "Preparing file merge"
6361
#: bzrlib/multiparent.py:426
6362
msgid "Importing revisions"
6365
#: bzrlib/option.py:526
6366
msgid "Show help message."
6369
#: bzrlib/option.py:528
6370
msgid "Only display errors and warnings."
6373
#: bzrlib/option.py:531
6374
msgid "Show usage message and options."
6377
#: bzrlib/option.py:533
6378
msgid "Display more information."
6381
#: bzrlib/option.py:541
6383
"Select changes introduced by the specified revision. See also \"help "
6387
#: bzrlib/option.py:543
6388
msgid "Branch to operate on, instead of working directory."
6391
#: bzrlib/option.py:545
6392
msgid "Detailed log format."
6395
#: bzrlib/option.py:545
6396
msgid "Format used by GNU ChangeLog files."
6399
#: bzrlib/option.py:545
6400
msgid "Log format with one line per revision."
6403
#: bzrlib/option.py:545
6404
msgid "Moderately short log format."
6407
#: bzrlib/option.py:545
6408
msgid "Use specified log format."
6411
#: bzrlib/option.py:547
6415
#: bzrlib/option.py:549
6416
msgid "LCA-newness merge."
6419
#: bzrlib/option.py:549
6420
msgid "Merge using external diff3."
6423
#: bzrlib/option.py:549
6424
msgid "Native diff3-style merge."
6427
#: bzrlib/option.py:549
6428
msgid "Select a particular merge algorithm."
6431
#: bzrlib/option.py:549
6432
msgid "Weave-based merge."
6435
#: bzrlib/option.py:551
6436
msgid "Merge algorithm"
6439
#: bzrlib/option.py:554
6440
msgid "Message string."
6443
#: bzrlib/option.py:556
6444
msgid "Use an ASCII NUL (\\0) separator rather than a newline."
6447
#: bzrlib/option.py:558
6448
msgid "Ignore differences between branches and overwrite unconditionally."
6451
#: bzrlib/option.py:560
6452
msgid "Remember the specified location as a default."
6455
#: bzrlib/option.py:562
6456
msgid "Reprocess to reduce spurious conflicts."
6459
#: bzrlib/option.py:566
6460
msgid "See \"help revisionspec\" for details."
6463
#: bzrlib/option.py:568
6464
msgid "Show internal object ids."
6467
#: bzrlib/option.py:571
6468
msgid "Display timezone as local, original, or utc."
6471
#: bzrlib/osutils.py:100
6472
msgid "Parameter {0!r} encoding is unsupported by {1} application locale."
6475
#: bzrlib/osutils.py:220
6476
msgid "lstat/stat of ({0!r}): {1!r}"
6479
#: bzrlib/osutils.py:1030 bzrlib/osutils.py:1041
6481
msgid "sorry, %r not allowed in path"
6484
#: bzrlib/osutils.py:1259
6486
msgid "%r is too short to calculate a relative path"
6489
#: bzrlib/plugin.py:143
6491
msgid "\"%s\" is not a valid <plugin_name>@<plugin_path> description "
6494
#: bzrlib/plugins/bash_completion/bashcomp.py:411
6495
msgid "Enable completions for the selected plugin (default: all plugins)"
6498
#: bzrlib/plugins/bash_completion/bashcomp.py:412
6499
msgid "Generate a shell function for bash command line completion."
6502
#: bzrlib/plugins/bash_completion/bashcomp.py:414
6504
"This command generates a shell function which can be used by bash to\n"
6505
"automatically complete the currently typed command when the user presses\n"
6506
"the completion key (usually tab)."
6509
#: bzrlib/plugins/bash_completion/bashcomp.py:418
6511
"Commonly used like this:\n"
6512
" eval \"`bzr bash-completion`\""
6515
#: bzrlib/plugins/bash_completion/bashcomp.py:424
6516
msgid "Name of the generated function (default: _bzr)"
6519
#: bzrlib/plugins/bash_completion/bashcomp.py:426
6520
msgid "Generate only the shell function, don't enable it"
6523
#: bzrlib/plugins/launchpad/account.py:66
6524
msgid "Setting ssh/sftp usernames for launchpad.net."
6527
#: bzrlib/plugins/launchpad/cmds.py:44
6528
msgid "Register a branch with launchpad.net."
6531
#: bzrlib/plugins/launchpad/cmds.py:46
6533
"This command lists a bzr branch in the directory of branches on\n"
6534
"launchpad.net. Registration allows the branch to be associated with\n"
6535
"bugs or specifications."
6538
#: bzrlib/plugins/launchpad/cmds.py:50
6540
"Before using this command you must register the project to which the\n"
6541
"branch belongs, and create an account for yourself on launchpad.net."
6544
#: bzrlib/plugins/launchpad/cmds.py:53
6547
" public_url: The publicly visible url for the branch to register.\n"
6548
" This must be an http or https url (which Launchpad can read\n"
6549
" from to access the branch). Local file urls, SFTP urls, and\n"
6550
" bzr+ssh urls will not work.\n"
6551
" If no public_url is provided, bzr will use the configured\n"
6552
" public_url if there is one for the current branch, and\n"
6556
#: bzrlib/plugins/launchpad/cmds.py:62
6559
" bzr register-branch http://foo.com/bzr/fooproject.mine \\\n"
6560
" --project fooproject"
6563
#: bzrlib/plugins/launchpad/cmds.py:69
6564
msgid "Launchpad project short name to associate with the branch."
6567
#: bzrlib/plugins/launchpad/cmds.py:76
6569
"Short name for the branch; by default taken from the last component of the "
6573
#: bzrlib/plugins/launchpad/cmds.py:80
6574
msgid "One-sentence description of the branch."
6577
#: bzrlib/plugins/launchpad/cmds.py:83
6578
msgid "Longer description of the purpose or contents of the branch."
6581
#: bzrlib/plugins/launchpad/cmds.py:86
6582
msgid "Branch author's email address, if not yourself."
6585
#: bzrlib/plugins/launchpad/cmds.py:89
6586
msgid "The bug this branch fixes."
6589
#: bzrlib/plugins/launchpad/cmds.py:92
6590
msgid "Prepare the request but don't actually send it."
6593
#: bzrlib/plugins/launchpad/cmds.py:114
6595
"register-branch requires a public branch url - see bzr help register-branch."
6598
#: bzrlib/plugins/launchpad/cmds.py:122
6599
msgid "--product is deprecated; please use --project."
6602
#: bzrlib/plugins/launchpad/cmds.py:152
6603
msgid "Open a Launchpad branch page in your web browser."
6606
#: bzrlib/plugins/launchpad/cmds.py:157
6607
msgid "Do not actually open the browser. Just say the URL we would use."
6610
#: bzrlib/plugins/launchpad/cmds.py:192
6612
msgid "Opening %s in web browser"
6615
#: bzrlib/plugins/launchpad/cmds.py:200
6616
msgid "Show or set the Launchpad user ID."
6619
#: bzrlib/plugins/launchpad/cmds.py:202
6621
"When communicating with Launchpad, some commands need to know your\n"
6622
"Launchpad user ID. This command can be used to set or show the\n"
6623
"user ID that Bazaar will use for such communication."
6626
#: bzrlib/plugins/launchpad/cmds.py:206
6629
" Show the Launchpad ID of the current user::"
6632
#: bzrlib/plugins/launchpad/cmds.py:209
6633
msgid " bzr launchpad-login"
6636
#: bzrlib/plugins/launchpad/cmds.py:211
6637
msgid " Set the Launchpad ID of the current user to 'bob'::"
6640
#: bzrlib/plugins/launchpad/cmds.py:213
6641
msgid " bzr launchpad-login bob"
6644
#: bzrlib/plugins/launchpad/cmds.py:220
6645
msgid "Don't check that the user name is valid."
6648
#: bzrlib/plugins/launchpad/cmds.py:235 bzrlib/plugins/launchpad/cmds.py:246
6649
msgid "Launchpad user ID exists and has SSH keys.\n"
6652
#: bzrlib/plugins/launchpad/cmds.py:238
6653
msgid "No Launchpad user ID configured.\n"
6656
#: bzrlib/plugins/launchpad/cmds.py:249
6658
msgid "Launchpad user ID set to '%s'.\n"
6661
#: bzrlib/plugins/launchpad/cmds.py:255
6662
msgid "Ask Launchpad to mirror a branch now."
6665
#: bzrlib/plugins/launchpad/cmds.py:272
6666
msgid "Propose merging a branch on Launchpad."
6669
#: bzrlib/plugins/launchpad/cmds.py:274
6671
"This will open your usual editor to provide the initial comment. When it\n"
6672
"has created the proposal, it will open it in your default web browser."
6675
#: bzrlib/plugins/launchpad/cmds.py:277
6677
"The branch will be proposed to merge into SUBMIT_BRANCH. If SUBMIT_BRANCH\n"
6678
"is not supplied, the remembered submit branch will be used. If no submit\n"
6679
"branch is remembered, the development focus will be used."
6682
#: bzrlib/plugins/launchpad/cmds.py:281
6684
"By default, the SUBMIT_BRANCH's review team will be requested to review\n"
6685
"the merge proposal. This can be overriden by specifying --review (-R).\n"
6686
"The parameter the launchpad account name of the desired reviewer. This\n"
6687
"may optionally be followed by '=' and the review type. For example:"
6690
#: bzrlib/plugins/launchpad/cmds.py:286
6691
msgid " bzr lp-propose-merge --review jrandom --review review-team=qa"
6694
#: bzrlib/plugins/launchpad/cmds.py:288
6696
"This will propose a merge, request \"jrandom\" to perform a review of\n"
6697
"unspecified type, and request \"review-team\" to perform a \"qa\" review."
6700
#: bzrlib/plugins/launchpad/cmds.py:293
6701
msgid "Propose the merge on staging."
6704
#: bzrlib/plugins/launchpad/cmds.py:295
6705
msgid "Commit message."
6708
#: bzrlib/plugins/launchpad/cmds.py:297
6709
msgid "Mark the proposal as approved immediately."
6712
#: bzrlib/plugins/launchpad/cmds.py:298
6713
msgid "The bug this proposal fixes."
6716
#: bzrlib/plugins/launchpad/cmds.py:300
6717
msgid "Requested reviewer and optional type."
6720
#: bzrlib/plugins/launchpad/cmds.py:335
6721
msgid "Find the proposal to merge this revision."
6724
#: bzrlib/plugins/launchpad/cmds.py:337
6726
"Finds the merge proposal(s) that discussed landing the specified revision.\n"
6727
"This works only if the selected branch was the merge proposal target, and\n"
6728
"if the merged_revno is recorded for the merge proposal. The proposal(s)\n"
6729
"are opened in a web browser."
6732
#: bzrlib/plugins/launchpad/cmds.py:342
6734
"Any revision involved in the merge may be specified-- the revision in\n"
6735
"which the merge was performed, or one of the revisions that was merged."
6738
#: bzrlib/plugins/launchpad/cmds.py:345
6739
msgid "So, to find the merge proposal that reviewed line 1 of README::"
6742
#: bzrlib/plugins/launchpad/cmds.py:347
6743
msgid " bzr lp-find-proposal -r annotate:README:1"
6746
#: bzrlib/plugins/launchpad/cmds.py:363
6747
msgid "No review found."
6750
#: bzrlib/plugins/launchpad/cmds.py:364
6752
msgid "%d proposals(s) found."
6755
#: bzrlib/plugins/launchpad/cmds.py:374
6756
msgid "Finding revision-id"
6759
#: bzrlib/plugins/launchpad/cmds.py:381
6760
msgid "Finding merge"
6763
#: bzrlib/plugins/launchpad/cmds.py:386
6764
msgid "Finding revno"
6767
#: bzrlib/plugins/launchpad/cmds.py:392
6768
msgid "Finding Launchpad branch"
6771
#: bzrlib/plugins/launchpad/cmds.py:395
6772
msgid "Finding proposals"
6775
#: bzrlib/plugins/launchpad/lp_api.py:241
6776
#: bzrlib/plugins/launchpad/lp_api.py:246
6778
msgid "%s is not registered on Launchpad"
6781
#: bzrlib/plugins/launchpad/lp_api.py:256
6783
msgid "%s has no development focus."
6786
#: bzrlib/plugins/launchpad/lp_api.py:261
6788
msgid "development focus %s has no branch."
6791
#: bzrlib/plugins/launchpad/lp_api.py:266
6793
msgid "source package %s has no branch."
6796
#: bzrlib/plugins/launchpad/lp_api.py:270
6798
msgid "%s has no associated product or source package."
6801
#: bzrlib/plugins/launchpad/lp_api.py:282
6803
msgid "%s is already up-to-date."
6806
#: bzrlib/plugins/launchpad/lp_api.py:289
6808
msgid "Pushing to %s"
6811
#: bzrlib/plugins/launchpad/lp_directory.py:170
6813
"resolution for {0}\n"
6818
#: bzrlib/plugins/launchpad/lp_propose.py:150
6820
msgid "There is already a branch merge proposal: %s"
6823
#: bzrlib/plugins/weave_fmt/bzrdir.py:237
6824
msgid "pb parameter to convert() is deprecated"
6827
#: bzrlib/plugins/weave_fmt/bzrdir.py:240
6828
msgid "starting upgrade from format 4 to 5"
6831
#: bzrlib/plugins/weave_fmt/bzrdir.py:250
6832
msgid "note: upgrade may be faster if all store files are ungzipped first"
6835
#: bzrlib/plugins/weave_fmt/bzrdir.py:279
6836
msgid "converting revision"
6839
#: bzrlib/plugins/weave_fmt/bzrdir.py:284
6840
msgid "upgraded to weaves:"
6843
#: bzrlib/plugins/weave_fmt/bzrdir.py:285
6845
msgid "%6d revisions and inventories"
6848
#: bzrlib/plugins/weave_fmt/bzrdir.py:287
6850
msgid "%6d revisions not present"
6853
#: bzrlib/plugins/weave_fmt/bzrdir.py:289
6858
#: bzrlib/plugins/weave_fmt/bzrdir.py:325
6859
msgid "writing weave"
6862
#: bzrlib/plugins/weave_fmt/bzrdir.py:329
6863
#: bzrlib/plugins/weave_fmt/bzrdir.py:331
6867
#: bzrlib/plugins/weave_fmt/bzrdir.py:348
6868
msgid "write revision"
6871
#: bzrlib/plugins/weave_fmt/bzrdir.py:362
6872
msgid "loading revision"
6875
#: bzrlib/plugins/weave_fmt/bzrdir.py:367
6877
msgid "revision {%s} not present in branch; will be converted as a ghost"
6880
#: bzrlib/plugins/weave_fmt/bzrdir.py:507
6881
msgid "starting upgrade from format 5 to 6"
6884
#: bzrlib/plugins/weave_fmt/bzrdir.py:517
6886
msgid "adding prefixes to %s"
6889
#: bzrlib/plugins/weave_fmt/bzrdir.py:557
6890
msgid "starting upgrade from format 6 to metadir"
6893
#: bzrlib/plugins/weave_fmt/bzrdir.py:565
6894
msgid "Removing ancestry.weave"
6897
#: bzrlib/plugins/weave_fmt/bzrdir.py:570
6898
msgid "Finding branch files"
6901
#: bzrlib/plugins/weave_fmt/bzrdir.py:580
6902
msgid "Upgrading repository"
6905
#: bzrlib/plugins/weave_fmt/bzrdir.py:590
6906
msgid "Upgrading branch"
6909
#: bzrlib/plugins/weave_fmt/bzrdir.py:613
6910
msgid "No working tree."
6913
#: bzrlib/plugins/weave_fmt/bzrdir.py:620
6914
msgid "Upgrading working tree"
6917
#: bzrlib/plugins/weave_fmt/bzrdir.py:641
6919
msgid "Make %s lock"
6922
#: bzrlib/plugins/weave_fmt/bzrdir.py:652
6927
#: bzrlib/push.py:56
6928
msgid "Created new branch."
6931
#: bzrlib/push.py:97
6934
"Target directory %s already contains a .bzr directory, but it is not valid."
6937
#: bzrlib/push.py:101
6940
"Target directory %s already exists, but does not have a .bzr directory. "
6941
"Supply --use-existing-dir to push there anyway."
6944
#: bzrlib/push.py:122
6946
msgid "Too many redirections trying to make %s."
6949
#: bzrlib/push.py:148
6951
"These branches have diverged. See \"bzr help diverged-branches\" for more "
6955
#: bzrlib/push.py:152
6958
"It is not possible to losslessly push to %s. You may want to use dpush "
6962
#: bzrlib/push.py:158
6965
"At %s you have a valid .bzr control directory, but not a branch or "
6966
"repository. This is an unsupported configuration. Please move the target "
6967
"directory out of the way and try again."
6970
#: bzrlib/reconcile.py:97
6972
msgid "Reconciling branch %s"
6975
#: bzrlib/reconcile.py:103
6977
msgid "Reconciling repository %s"
6980
#: bzrlib/reconcile.py:105
6981
msgid "Reconciling repository"
6984
#: bzrlib/reconcile.py:111
6986
msgid "%s cannot canonicalize CHKs."
6989
#: bzrlib/reconcile.py:119
6990
msgid "Reconcile aborted: revision index has inconsistent parents."
6993
#: bzrlib/reconcile.py:121
6994
msgid "Run \"bzr check\" for more details."
6997
#: bzrlib/reconcile.py:123
6998
msgid "Reconciliation complete."
7001
#: bzrlib/reconcile.py:166
7002
msgid "Fixing last revision info {0} => {1}"
7005
#: bzrlib/reconcile.py:173
7006
msgid "revision_history ok."
7009
#: bzrlib/reconcile.py:234
7010
msgid "Reading inventory data"
7013
#: bzrlib/reconcile.py:254 bzrlib/reconcile.py:384
7014
msgid "Inventory ok."
7017
#: bzrlib/reconcile.py:256 bzrlib/reconcile.py:386
7018
msgid "Backing up inventory"
7021
#: bzrlib/reconcile.py:258
7022
msgid "Backup inventory created."
7025
#: bzrlib/reconcile.py:274 bzrlib/reconcile.py:405
7026
msgid "Writing weave"
7029
#: bzrlib/reconcile.py:277 bzrlib/reconcile.py:408
7030
msgid "Inventory regenerated."
7033
#: bzrlib/reconcile.py:371 bzrlib/reconcile.py:373 bzrlib/reconcile.py:376
7034
msgid "Reading indexes"
7037
#: bzrlib/reconcile.py:380 bzrlib/reconcile.py:382
7038
msgid "Checking unused inventories"
7041
#: bzrlib/reconcile.py:388
7042
msgid "Backup Inventory created"
7045
#: bzrlib/reconcile.py:446
7046
msgid "Fixing text parents"
7049
#: bzrlib/reconfigure.py:54
7050
msgid "{0} is now stacked on {1}\n"
7053
#: bzrlib/reconfigure.py:69
7055
msgid "%s is now not stacked\n"
7058
#: bzrlib/remote.py:1228 bzrlib/repository.py:289
7060
msgid "bzr: ERROR (ignored): %s"
7063
#: bzrlib/remote.py:2541
7064
msgid "Copying repository content as tarball..."
7067
#: bzrlib/rename_map.py:69
7068
msgid "Calculating hashes"
7071
#: bzrlib/rename_map.py:107
7072
msgid "Determining hash hits"
7075
#: bzrlib/rename_map.py:242
7079
#: bzrlib/repository.py:1799
7080
msgid "Moving repository to repository.backup"
7083
#: bzrlib/repository.py:1806
7084
msgid "Creating new repository"
7087
#: bzrlib/repository.py:1811
7088
msgid "Copying content"
7091
#: bzrlib/repository.py:1815
7092
msgid "Deleting old repository content"
7095
#: bzrlib/repository.py:1817
7096
msgid "repository converted"
7099
#: bzrlib/revisionspec.py:903
7100
msgid "Using {0} {1}"
7103
#: bzrlib/send.py:59
7105
msgid "Mail client \"%s\" does not support specifying body"
7108
#: bzrlib/send.py:63
7109
msgid "--remember requires a branch to be specified."
7112
#: bzrlib/send.py:78
7113
msgid "No submit branch known or specified"
7116
#: bzrlib/send.py:81
7117
msgid "Using saved {0} location \"{1}\" to determine what changes to submit."
7120
#: bzrlib/send.py:99
7122
msgid "No such send format '%s'."
7125
#: bzrlib/send.py:115
7126
msgid "bzr send takes at most two one revision identifiers"
7129
#: bzrlib/send.py:128
7130
msgid "No revisions to submit."
7133
#: bzrlib/send.py:140
7135
"- not supported for merge directives that use more than one output file."
7138
#: bzrlib/send.py:186
7139
msgid "Format 0.9 does not permit bundle with no patch"
7142
#: bzrlib/shelf_ui.py:46
7144
msgid "Shelve adding file \"%(path)s\"?"
7147
#: bzrlib/shelf_ui.py:47
7148
msgid "Shelve binary changes?"
7151
#: bzrlib/shelf_ui.py:48
7152
msgid "Shelve changing \"%s\" from %(other)s to %(this)s?"
7155
#: bzrlib/shelf_ui.py:50
7157
msgid "Shelve removing file \"%(path)s\"?"
7160
#: bzrlib/shelf_ui.py:51
7162
msgid "Shelve %d change(s)?"
7165
#: bzrlib/shelf_ui.py:52
7169
#: bzrlib/shelf_ui.py:53
7172
"Shelve changing target of \"%(path)s\" from \"%(other)s\" to \"%(this)s\"?"
7175
#: bzrlib/shelf_ui.py:55
7177
msgid "Shelve renaming \"%(other)s\" => \"%(this)s\"?"
7180
#: bzrlib/shelf_ui.py:70
7182
msgid "Changes shelved with id \"%d\"."
7185
#: bzrlib/shelf_ui.py:74
7186
msgid "Selected changes destroyed."
7189
#: bzrlib/shelf_ui.py:78
7190
msgid "Selected changes:"
7193
#: bzrlib/shelf_ui.py:98
7195
msgid "Delete file \"%(path)s\"?"
7198
#: bzrlib/shelf_ui.py:99
7199
msgid "Apply binary changes?"
7202
#: bzrlib/shelf_ui.py:100
7204
msgid "Change \"%(path)s\" from %(this)s to %(other)s?"
7207
#: bzrlib/shelf_ui.py:102
7209
msgid "Add file \"%(path)s\"?"
7212
#: bzrlib/shelf_ui.py:103
7214
msgid "Apply %d change(s)?"
7217
#: bzrlib/shelf_ui.py:104
7218
msgid "Apply change?"
7221
#: bzrlib/shelf_ui.py:105
7223
msgid "Change target of \"%(path)s\" from \"%(this)s\" to \"%(other)s\"?"
7226
#: bzrlib/shelf_ui.py:107
7228
msgid "Rename \"%(this)s\" => \"%(other)s\"?"
7231
#: bzrlib/shelf_ui.py:402
7232
msgid "No changes are shelved."
7235
#: bzrlib/shelf_ui.py:460
7237
msgid "Using changes with id \"%d\"."
7240
#: bzrlib/shelf_ui.py:464
7245
#: bzrlib/shelf_ui.py:476
7247
msgid "Deleted changes with id \"%d\"."
7250
#: bzrlib/smart/medium.py:714
7251
msgid "HPSS calls: {0} ({1} vfs) {2}"
7254
#: bzrlib/smart/server.py:169
7255
msgid "Requested to stop gracefully"
7258
#: bzrlib/smart/server.py:179
7260
msgid "Waiting for %d client(s) to finish"
7263
#: bzrlib/smart/server.py:185
7265
msgid "Still waiting for %d client(s) to finish"
7268
#: bzrlib/smart/server.py:219
7270
msgid "listening socket error: %s"
7273
#: bzrlib/smart/server.py:452
7275
msgid "listening on port: %s"
7278
#: bzrlib/switch.py:73
7279
msgid "Pending merges must be committed or reverted before using switch."
7282
#: bzrlib/switch.py:100
7284
"Cannot switch as local commits found in the checkout. Commit these to the "
7285
"bound branch or use --force to throw them away."
7288
#: bzrlib/switch.py:105
7291
"Unable to connect to current master branch %(target)s: %(error)s To switch "
7292
"anyway, use --force."
7295
#: bzrlib/switch.py:129
7296
msgid "Cannot switch a branch, only a checkout."
7299
#: bzrlib/switch.py:167
7301
msgid "Tree is up to date at revision %d."
7304
#: bzrlib/switch.py:173
7306
msgid "Updated to revision %d."
7309
#: bzrlib/transform.py:1723 bzrlib/transform.py:1734 bzrlib/transform.py:1736
7313
#: bzrlib/transform.py:1762 bzrlib/transform.py:1830
7314
msgid "removing file"
7317
#: bzrlib/transform.py:1780 bzrlib/transform.py:1865
7321
#: bzrlib/transform.py:2590
7322
msgid "Building tree"
7325
#: bzrlib/transform.py:2680 bzrlib/transform.py:2707
7326
msgid "Adding file contents"
7329
#: bzrlib/transform.py:3009
7330
msgid "Resolution pass"
7333
#: bzrlib/transport/ftp/_gssapi.py:88
7335
msgid "Authenticated as %s"
7338
#: bzrlib/tree.py:637
7339
msgid "*** {0} content-filter: {1} => {2!r}"
7342
#: bzrlib/upgrade.py:77
7344
msgid "This is a checkout. The branch (%s) needs to be upgraded separately."
7347
#: bzrlib/upgrade.py:100
7349
msgid "cannot upgrade from bzrdir format %s"
7352
#: bzrlib/upgrade.py:103
7354
msgid "starting upgrade of %s"
7357
#: bzrlib/upgrade.py:110
7361
#: bzrlib/upgrade.py:120
7362
msgid "Deleting backup.bzr"
7365
#: bzrlib/upgrade.py:151
7368
"SUMMARY: {0} upgrades attempted, {1} succeeded, {2} failed"
7371
#: bzrlib/upgrade.py:208
7373
msgid "Found %d dependent branches - upgrading ..."
7376
#: bzrlib/upgrade.py:276
7377
msgid "Upgrading bzrdirs"
7380
#: bzrlib/upgrade.py:282
7382
msgid "Upgrading %s"
7385
#: bzrlib/upgrade.py:283
7386
msgid "Upgrading {0} {1} ..."
7389
#: bzrlib/upgrade.py:301
7390
msgid "Removing backup ..."
7393
#: bzrlib/upgrade.py:305
7394
msgid "failed to clean-up {0}: {1}"
7397
#: bzrlib/vf_repository.py:1091
7401
#: bzrlib/vf_repository.py:1117
7405
#: bzrlib/vf_repository.py:1622 bzrlib/vf_repository.py:1631
7406
msgid "Calculating text parents"
7409
#: bzrlib/vf_repository.py:1707
7413
#: bzrlib/vf_repository.py:2536
7414
msgid "loading text store"
7417
#: bzrlib/vf_repository.py:2542
7418
msgid "checking text graph"
7421
#: bzrlib/vf_repository.py:2998 bzrlib/vf_repository.py:3012
7422
#: bzrlib/vf_repository.py:3127
7423
msgid "Transferring revisions"
7426
#: bzrlib/win32utils.py:146
7427
msgid "Failed to GetProcessMemoryInfo()"
7430
#: bzrlib/win32utils.py:167
7431
msgid "Cannot debug memory on win32 without ctypes or win32process"
7434
#: bzrlib/win32utils.py:172
7435
msgid "WorkingSize {0:>7}KiB\tPeakWorking {1:>7}KiB\t{2}"
7438
#: bzrlib/win32utils.py:180
7440
msgid "WorkingSize %8d KiB"
7443
#: bzrlib/win32utils.py:181
7445
msgid "PeakWorking %8d KiB"
7448
#: bzrlib/win32utils.py:182
7450
msgid "PagefileUsage %8d KiB"
7453
#: bzrlib/win32utils.py:183
7455
msgid "PeakPagefileUsage %8d KiB"
7458
#: bzrlib/win32utils.py:185
7460
msgid "PrivateUsage %8d KiB"
7463
#: bzrlib/win32utils.py:186
7465
msgid "PageFaultCount %8d"
7468
#: bzrlib/workingtree.py:1482
7469
msgid "Rerun update after fixing the conflicts."
7472
#: dummy/help_topics/authentication/summary.txt:1
7473
msgid "Information on configuring authentication"
7476
#: dummy/help_topics/basic/detail.txt:1
7478
"Bazaar 2.6.0dev1 -- a free distributed version-control tool\n"
7479
"http://bazaar.canonical.com/"
7482
#: dummy/help_topics/basic/detail.txt:4
7485
" bzr init makes this directory a versioned branch\n"
7486
" bzr branch make a copy of another branch"
7489
#: dummy/help_topics/basic/detail.txt:8
7491
" bzr add make files or directories versioned\n"
7492
" bzr ignore ignore a file or pattern\n"
7493
" bzr mv move or rename a versioned file"
7496
#: dummy/help_topics/basic/detail.txt:12
7498
" bzr status summarize changes in working copy\n"
7499
" bzr diff show detailed diffs"
7502
#: dummy/help_topics/basic/detail.txt:15
7504
" bzr merge pull in changes from another branch\n"
7505
" bzr commit save some or all changes\n"
7506
" bzr send send changes via email"
7509
#: dummy/help_topics/basic/detail.txt:19
7511
" bzr log show history of changes\n"
7512
" bzr check validate storage"
7515
#: dummy/help_topics/basic/detail.txt:22
7517
" bzr help init more help on e.g. init command\n"
7518
" bzr help commands list all commands\n"
7519
" bzr help topics list all help topics\n"
7522
#: dummy/help_topics/basic/summary.txt:1
7523
msgid "Basic commands"
7526
#: dummy/help_topics/branches/detail.txt:1
7530
#: dummy/help_topics/branches/detail.txt:3
7532
"A branch consists of the state of a project, including all of its\n"
7533
"history. All branches have a repository associated (which is where the\n"
7534
"branch history is stored), but multiple branches may share the same\n"
7535
"repository (a shared repository). Branches can be copied and merged."
7538
#: dummy/help_topics/branches/detail.txt:8
7540
"In addition, one branch may be bound to another one. Binding to another\n"
7541
"branch indicates that commits which happen in this branch must also \n"
7542
"happen in the other branch. Bazaar ensures consistency by not allowing \n"
7543
"commits when the two branches are out of date. In order for a commit \n"
7544
"to succeed, it may be necessary to update the current branch using \n"
7548
#: dummy/help_topics/branches/detail.txt:15
7549
#: dummy/help_topics/checkouts/detail.txt:66
7550
#: dummy/help_topics/repositories/detail.txt:36
7551
msgid "Related commands::"
7554
#: dummy/help_topics/branches/detail.txt:17
7556
" init Change a directory into a versioned branch.\n"
7557
" branch Create a new branch that is a copy of an existing branch.\n"
7558
" merge Perform a three-way merge.\n"
7559
" bind Bind a branch to another one.\n"
7562
#: dummy/help_topics/branches/summary.txt:1
7563
msgid "Information on what a branch is"
7566
#: dummy/help_topics/bugs/summary.txt:1
7567
msgid "Bug tracker settings"
7570
#: dummy/help_topics/checkouts/detail.txt:1
7574
#: dummy/help_topics/checkouts/detail.txt:3
7576
"Checkouts are source trees that are connected to a branch, so that when\n"
7577
"you commit in the source tree, the commit goes into that branch. They\n"
7578
"allow you to use a simpler, more centralized workflow, ignoring some of\n"
7579
"Bazaar's decentralized features until you want them. Using checkouts\n"
7580
"with shared repositories is very similar to working with SVN or CVS, but\n"
7581
"doesn't have the same restrictions. And using checkouts still allows\n"
7582
"others working on the project to use whatever workflow they like."
7585
#: dummy/help_topics/checkouts/detail.txt:11
7587
"A checkout is created with the bzr checkout command (see \"help "
7589
"You pass it a reference to another branch, and it will create a local copy\n"
7590
"for you that still contains a reference to the branch you created the\n"
7591
"checkout from (the master branch). Then if you make any commits they will "
7593
"made on the other branch first. This creates an instant mirror of your work, "
7595
"facilitates lockstep development, where each developer is working together,\n"
7596
"continuously integrating the changes of others."
7599
#: dummy/help_topics/checkouts/detail.txt:19
7601
"However the checkout is still a first class branch in Bazaar terms, so that\n"
7602
"you have the full history locally. As you have a first class branch you "
7604
"also commit locally if you want, for instance due to the temporary loss af "
7606
"network connection. Use the --local option to commit to do this. All the "
7608
"commits will then be made on the master branch the next time you do a non-"
7613
#: dummy/help_topics/checkouts/detail.txt:26
7615
"If you are using a checkout from a shared branch you will periodically want "
7617
"pull in all the changes made by others. This is done using the \"update\"\n"
7618
"command. The changes need to be applied before any non-local commit, but\n"
7619
"Bazaar will tell you if there are any changes and suggest that you use this\n"
7620
"command when needed."
7623
#: dummy/help_topics/checkouts/detail.txt:32
7625
"It is also possible to create a \"lightweight\" checkout by passing the\n"
7626
"--lightweight flag to checkout. A lightweight checkout is even closer to an\n"
7627
"SVN checkout in that it is not a first class branch, it mainly consists of "
7629
"working tree. This means that any history operations must query the master\n"
7630
"branch, which could be slow if a network connection is involved. Also, as "
7632
"don't have a local branch, then you cannot commit locally."
7635
#: dummy/help_topics/checkouts/detail.txt:39
7637
"Lightweight checkouts work best when you have fast reliable access to the\n"
7638
"master branch. This means that if the master branch is on the same disk or "
7640
"a lightweight checkout will be faster than a heavyweight one for any "
7642
"that modify the revision history (as only one copy of the branch needs to\n"
7643
"be updated). Heavyweight checkouts will generally be faster for any command\n"
7644
"that uses the history but does not change it, but if the master branch is "
7646
"the same disk then there won't be a noticeable difference."
7649
#: dummy/help_topics/checkouts/detail.txt:47
7651
"Another possible use for a checkout is to use it with a treeless repository\n"
7652
"containing your branches, where you maintain only one working tree by\n"
7653
"switching the master branch that the checkout points to when you want to\n"
7654
"work on a different branch."
7657
#: dummy/help_topics/checkouts/detail.txt:52
7659
"Obviously to commit on a checkout you need to be able to write to the "
7661
"branch. This means that the master branch must be accessible over a "
7663
"protocol , such as sftp://, and that you have write permissions at the "
7665
"end. Checkouts also work on the local file system, so that all that matters "
7670
#: dummy/help_topics/checkouts/detail.txt:58
7672
"You can change the master of a checkout by using the \"switch\" command "
7674
"\"help switch\"). This will change the location that the commits are sent "
7676
"The \"bind\" command can also be used to turn a normal branch into a heavy\n"
7677
"checkout. If you would like to convert your heavy checkout into a normal\n"
7678
"branch so that every commit is local, you can use the \"unbind\" command. To "
7680
"whether or not a branch is bound or not you can use the \"info\" command. If "
7682
"branch is bound it will tell you the location of the bound branch."
7685
#: dummy/help_topics/checkouts/detail.txt:68
7687
" checkout Create a checkout. Pass --lightweight to get a lightweight\n"
7689
" update Pull any changes in the master branch in to your checkout\n"
7690
" commit Make a commit that is sent to the master branch. If you have\n"
7691
" a heavy checkout then the --local option will commit to the\n"
7692
" checkout without sending the commit to the master\n"
7693
" switch Change the master branch that the commits in the checkout "
7696
" bind Turn a standalone branch into a heavy checkout so that any\n"
7697
" commits will be sent to the master branch\n"
7698
" unbind Turn a heavy checkout into a standalone branch so that any\n"
7699
" commits are only made locally\n"
7700
" info Displays whether a branch is bound or unbound. If the branch "
7702
" bound, then it will also display the location of the bound "
7706
#: dummy/help_topics/checkouts/summary.txt:1
7707
msgid "Information on what a checkout is"
7710
#: dummy/help_topics/commands/summary.txt:1
7711
msgid "Basic help for all commands"
7714
#: dummy/help_topics/configuration/summary.txt:1
7715
msgid "Details on the configuration settings available"
7718
#: dummy/help_topics/conflict-types/summary.txt:1
7719
msgid "Types of conflicts and what to do about them"
7722
#: dummy/help_topics/content-filters/summary.txt:1
7723
msgid "Conversion of content into/from working trees"
7726
#: dummy/help_topics/criss-cross/detail.txt:1
7730
#: dummy/help_topics/criss-cross/detail.txt:3
7732
"A criss-cross in the branch history can cause the default merge technique\n"
7733
"to emit more conflicts than would normally be expected."
7736
#: dummy/help_topics/criss-cross/detail.txt:6
7738
"In complex merge cases, ``bzr merge --lca`` or ``bzr merge --weave`` may "
7740
"better results. You may wish to ``bzr revert`` the working tree and merge\n"
7741
"again. Alternatively, use ``bzr remerge`` on particular conflicted files."
7744
#: dummy/help_topics/criss-cross/detail.txt:10
7746
"Criss-crosses occur in a branch's history if two branches merge the same "
7748
"and then merge one another, or if two branches merge one another at the "
7750
"time. They can be avoided by having each branch only merge from or into a\n"
7751
"designated central branch (a \"star topology\")."
7754
#: dummy/help_topics/criss-cross/detail.txt:15
7756
"Criss-crosses cause problems because of the way merge works. Bazaar's "
7758
"merge is a three-way merger; in order to merge OTHER into THIS, it must\n"
7759
"find a basis for comparison, BASE. Using BASE, it can determine whether\n"
7760
"differences between THIS and OTHER are due to one side adding lines, or\n"
7761
"from another side removing lines."
7764
#: dummy/help_topics/criss-cross/detail.txt:21
7766
"Criss-crosses mean there is no good choice for a base. Selecting the "
7768
"merge points could cause one side's changes to be silently discarded.\n"
7769
"Selecting older merge points (which Bazaar does) mean that extra conflicts\n"
7773
#: dummy/help_topics/criss-cross/detail.txt:26
7775
"The ``weave`` merge type is not affected by this problem because it uses\n"
7776
"line-origin detection instead of a basis revision to determine the cause of\n"
7780
#: dummy/help_topics/criss-cross/summary.txt:1
7781
msgid "Information on criss-cross merging"
7784
#: dummy/help_topics/current-formats/summary.txt:1
7785
msgid "Current storage formats"
7788
#: dummy/help_topics/debug-flags/summary.txt:1
7789
msgid "Options to show or record debug information"
7792
#: dummy/help_topics/diverged-branches/summary.txt:1
7793
msgid "How to fix diverged branches"
7796
#: dummy/help_topics/env-variables/detail.txt:1
7797
msgid "Environment Variables"
7800
#: dummy/help_topics/env-variables/detail.txt:3
7802
"=================== "
7803
"===========================================================\n"
7804
"BZRPATH Path where bzr is to look for shell plugin external\n"
7806
"BZR_EMAIL E-Mail address of the user. Overrides EMAIL.\n"
7807
"EMAIL E-Mail address of the user.\n"
7808
"BZR_EDITOR Editor for editing commit messages. Overrides EDITOR.\n"
7809
"EDITOR Editor for editing commit messages.\n"
7810
"BZR_PLUGIN_PATH Paths where bzr should look for plugins.\n"
7811
"BZR_DISABLE_PLUGINS Plugins that bzr should not load.\n"
7812
"BZR_PLUGINS_AT Plugins to load from a directory not in "
7813
"BZR_PLUGIN_PATH.\n"
7814
"BZR_HOME Directory holding .bazaar config dir. Overrides HOME.\n"
7815
"BZR_HOME (Win32) Directory holding bazaar config dir. Overrides APPDATA "
7818
"BZR_REMOTE_PATH Full name of remote 'bzr' command (for bzr+ssh:// "
7820
"BZR_SSH Path to SSH client, or one of paramiko, openssh, "
7823
"BZR_LOG Location of .bzr.log (use '/dev/null' to suppress log).\n"
7824
"BZR_LOG (Win32) Location of .bzr.log (use 'NUL' to suppress log).\n"
7825
"BZR_COLUMNS Override implicit terminal width.\n"
7826
"BZR_CONCURRENCY Number of processes that can be run concurrently "
7828
"BZR_PROGRESS_BAR Override the progress display. Values are 'none' or "
7830
"BZR_PDB Control whether to launch a debugger on error.\n"
7831
"BZR_SIGQUIT_PDB Control whether SIGQUIT behaves normally or invokes a\n"
7832
" breakin debugger.\n"
7833
"BZR_TEXTUI_INPUT Force console input mode for prompts to line-based "
7835
" of char-based).\n"
7836
"=================== "
7837
"===========================================================\n"
7840
#: dummy/help_topics/env-variables/summary.txt:1
7841
msgid "Environment variable names and values"
7844
#: dummy/help_topics/eol/summary.txt:1
7845
msgid "Information on end-of-line handling"
7848
#: dummy/help_topics/files/detail.txt:1
7852
#: dummy/help_topics/files/detail.txt:3
7854
":On Unix: ~/.bazaar/bazaar.conf\n"
7855
":On Windows: C:\\\\Documents and Settings\\\\username\\\\Application Data\\\\"
7856
"bazaar\\\\2.0\\\\bazaar.conf"
7859
#: dummy/help_topics/files/detail.txt:6
7861
"Contains the user's default configuration. The section ``[DEFAULT]`` is\n"
7862
"used to define general configuration that will be applied everywhere.\n"
7863
"The section ``[ALIASES]`` can be used to create command aliases for\n"
7864
"commonly used options."
7867
#: dummy/help_topics/files/detail.txt:11
7868
msgid "A typical config file might look something like::"
7871
#: dummy/help_topics/files/detail.txt:13
7874
" email=John Doe <jdoe@isp.com>"
7877
#: dummy/help_topics/files/detail.txt:16
7880
" commit = commit --strict\n"
7881
" log10 = log --short -r -10..-1\n"
7884
#: dummy/help_topics/files/summary.txt:1
7885
msgid "Information on configuration and log files"
7888
#: dummy/help_topics/formats/detail.txt:1
7889
msgid "Storage Formats"
7892
#: dummy/help_topics/formats/detail.txt:3
7894
"To ensure that older clients do not access data incorrectly,\n"
7895
"Bazaar's policy is to introduce a new storage format whenever\n"
7896
"new features requiring new metadata are added. New storage\n"
7897
"formats may also be introduced to improve performance and\n"
7901
#: dummy/help_topics/formats/detail.txt:9
7903
"The newest format, 2a, is highly recommended. If your\n"
7904
"project is not using 2a, then you should suggest to the\n"
7905
"project owner to upgrade."
7908
#: dummy/help_topics/formats/detail.txt:13
7914
#: dummy/help_topics/formats/detail.txt:16
7916
" Some of the older formats have two variants:\n"
7917
" a plain one and a rich-root one. The latter include an additional\n"
7918
" field about the root of the tree. There is no performance cost\n"
7919
" for using a rich-root format but you cannot easily merge changes\n"
7920
" from a rich-root format into a plain format. As a consequence,\n"
7921
" moving a project to a rich-root format takes some co-ordination\n"
7922
" in that all contributors need to upgrade their repositories\n"
7923
" around the same time. 2a and all future formats will be\n"
7924
" implicitly rich-root."
7927
#: dummy/help_topics/formats/detail.txt:26
7929
"See :doc:`current-formats-help` for the complete list of\n"
7930
"currently supported formats. See :doc:`other-formats-help` for\n"
7931
"descriptions of any available experimental and deprecated formats.\n"
7934
#: dummy/help_topics/formats/summary.txt:1
7935
msgid "Information on choosing a storage format"
7938
#: dummy/help_topics/global-options/detail.txt:1
7939
msgid "Global Options"
7942
#: dummy/help_topics/global-options/detail.txt:3
7944
"These options may be used with any command, and may appear in front of any\n"
7945
"command. (e.g. ``bzr --profile help``)."
7948
#: dummy/help_topics/global-options/detail.txt:6
7950
"--version Print the version number. Must be supplied before the "
7952
"--no-aliases Do not process command aliases when running this command.\n"
7953
"--builtin Use the built-in version of a command, not the plugin "
7955
" This does not suppress other plugin effects.\n"
7956
"--no-plugins Do not process any plugins.\n"
7957
"--no-l10n Do not translate messages.\n"
7958
"--concurrency Number of processes that can be run concurrently (selftest)."
7961
#: dummy/help_topics/global-options/detail.txt:14
7963
"--profile Profile execution using the hotshot profiler.\n"
7964
"--lsprof Profile execution using the lsprof profiler.\n"
7965
"--lsprof-file Profile execution using the lsprof profiler, and write the\n"
7966
" results to a specified file. If the filename ends with "
7968
" text format will be used. If the filename either starts "
7970
" \"callgrind.out\" or end with \".callgrind\", the output will "
7972
" formatted for use with KCacheGrind. Otherwise, the output\n"
7973
" will be a pickle.\n"
7974
"--coverage Generate line coverage report in the specified directory."
7977
#: dummy/help_topics/global-options/detail.txt:24
7979
"-Oname=value Override the ``name`` config option setting it to ``value`` "
7981
" the duration of the command. This can be used multiple times "
7983
" several options need to be overridden."
7986
#: dummy/help_topics/global-options/detail.txt:28
7988
"See http://doc.bazaar.canonical.com/developers/profiling.html for more\n"
7989
"information on profiling."
7992
#: dummy/help_topics/global-options/detail.txt:31
7994
"A number of debug flags are also available to assist troubleshooting and\n"
7995
"development. See :doc:`debug-flags-help`.\n"
7998
#: dummy/help_topics/global-options/summary.txt:1
7999
msgid "Options that control how Bazaar runs"
8002
#: dummy/help_topics/hidden-commands/summary.txt:1
8003
msgid "All hidden commands"
8006
#: dummy/help_topics/hooks/summary.txt:1
8007
msgid "Points at which custom processing can be added"
8010
#: dummy/help_topics/launchpad/detail.txt:1
8011
msgid "Integration with Launchpad.net"
8014
#: dummy/help_topics/launchpad/detail.txt:3
8016
"Launchpad.net provides free Bazaar branch hosting with integrated bug and\n"
8017
"specification tracking."
8020
#: dummy/help_topics/launchpad/detail.txt:6
8022
"The bzr client (through the plugin called 'launchpad') has special\n"
8023
"features to communicate with Launchpad:"
8026
#: dummy/help_topics/launchpad/detail.txt:9
8028
" * The launchpad-login command tells Bazaar your Launchpad user name. "
8030
" is then used by the 'lp:' transport to download your branches using\n"
8034
#: dummy/help_topics/launchpad/detail.txt:13
8036
" * The 'lp:' transport uses Launchpad as a directory service: for "
8038
" 'lp:bzr' and 'lp:python' refer to the main branches of the relevant\n"
8039
" projects and may be branched, logged, etc. You can also use the 'lp:'\n"
8040
" transport to refer to specific branches, e.g. lp:~bzr/bzr/trunk."
8043
#: dummy/help_topics/launchpad/detail.txt:18
8045
" * The 'lp:' bug tracker alias can expand launchpad bug numbers to their\n"
8046
" URLs for use with 'bzr commit --fixes', e.g. 'bzr commit --fixes "
8048
" will record a revision property that marks that revision as fixing\n"
8049
" Launchpad bug 12345. When you push that branch to Launchpad it will\n"
8050
" automatically be linked to the bug report."
8053
#: dummy/help_topics/launchpad/detail.txt:24
8055
" * The register-branch command tells Launchpad about the url of a\n"
8056
" public branch. Launchpad will then mirror the branch, display\n"
8057
" its contents and allow it to be attached to bugs and other\n"
8061
#: dummy/help_topics/launchpad/detail.txt:29
8062
msgid "For more information see http://help.launchpad.net/\n"
8065
#: dummy/help_topics/launchpad/summary.txt:1
8066
msgid "Using Bazaar with Launchpad.net"
8069
#: dummy/help_topics/location-alias/summary.txt:1
8070
msgid "Aliases for remembered locations"
8073
#: dummy/help_topics/log-formats/summary.txt:1
8074
msgid "Details on the logging formats available"
8077
#: dummy/help_topics/other-formats/summary.txt:1
8078
msgid "Experimental and deprecated storage formats"
8081
#: dummy/help_topics/patterns/summary.txt:1
8082
msgid "Information on the pattern syntax"
8085
#: dummy/help_topics/repositories/detail.txt:1
8086
msgid "Repositories"
8089
#: dummy/help_topics/repositories/detail.txt:3
8091
"Repositories in Bazaar are where committed information is stored. There is\n"
8092
"a repository associated with every branch."
8095
#: dummy/help_topics/repositories/detail.txt:6
8097
"Repositories are a form of database. Bzr will usually maintain this for\n"
8098
"good performance automatically, but in some situations (e.g. when doing\n"
8099
"very many commits in a short time period) you may want to ask bzr to\n"
8100
"optimise the database indices. This can be done by the 'bzr pack' command."
8103
#: dummy/help_topics/repositories/detail.txt:11
8105
"By default just running 'bzr init' will create a repository within the new\n"
8106
"branch but it is possible to create a shared repository which allows "
8108
"branches to share their information in the same location. When a new branch "
8110
"created it will first look to see if there is a containing shared repository "
8115
#: dummy/help_topics/repositories/detail.txt:17
8117
"When two branches of the same project share a repository, there is\n"
8118
"generally a large space saving. For some operations (e.g. branching\n"
8119
"within the repository) this translates in to a large time saving."
8122
#: dummy/help_topics/repositories/detail.txt:21
8124
"To create a shared repository use the init-repository command (or the alias\n"
8125
"init-repo). This command takes the location of the repository to create. "
8127
"means that 'bzr init-repository repo' will create a directory named 'repo',\n"
8128
"which contains a shared repository. Any new branches that are created in "
8130
"directory will then use it for storage."
8133
#: dummy/help_topics/repositories/detail.txt:27
8135
"It is a good idea to create a repository whenever you might create more\n"
8136
"than one branch of a project. This is true for both working areas where you\n"
8137
"are doing the development, and any server areas that you use for hosting\n"
8138
"projects. In the latter case, it is common to want branches without working\n"
8139
"trees. Since the files in the branch will not be edited directly there is "
8141
"need to use up disk space for a working tree. To create a repository in "
8143
"the branches will not have working trees pass the '--no-trees' option to\n"
8144
"'init-repository'."
8147
#: dummy/help_topics/repositories/detail.txt:38
8149
" init-repository Create a shared repository. Use --no-trees to create "
8151
" in which new branches won't get a working tree.\n"
8154
#: dummy/help_topics/repositories/summary.txt:1
8155
msgid "Basic information on shared repositories."
8158
#: dummy/help_topics/revisionspec/summary.txt:1
8159
msgid "Explain how to use --revision"
8162
#: dummy/help_topics/rules/summary.txt:1
8163
msgid "Information on defining rule-based preferences"
8166
#: dummy/help_topics/standalone-trees/detail.txt:1
8167
msgid "Standalone Trees"
8170
#: dummy/help_topics/standalone-trees/detail.txt:3
8172
"A standalone tree is a working tree with an associated repository. It\n"
8173
"is an independently usable branch, with no dependencies on any other.\n"
8174
"Creating a standalone tree (via bzr init) is the quickest way to put\n"
8175
"an existing project under version control."
8178
#: dummy/help_topics/standalone-trees/detail.txt:8
8179
msgid "Related Commands::"
8182
#: dummy/help_topics/standalone-trees/detail.txt:10
8183
msgid " init Make a directory into a versioned branch.\n"
8186
#: dummy/help_topics/standalone-trees/summary.txt:1
8187
msgid "Information on what a standalone tree is"
8190
#: dummy/help_topics/standard-options/detail.txt:1
8191
msgid "Standard Options"
8194
#: dummy/help_topics/standard-options/detail.txt:3
8195
msgid "Standard options are legal for all commands."
8198
#: dummy/help_topics/standard-options/detail.txt:5
8200
"--help, -h Show help message.\n"
8201
"--verbose, -v Display more information.\n"
8202
"--quiet, -q Only display errors and warnings."
8205
#: dummy/help_topics/standard-options/detail.txt:9
8206
msgid "Unlike global options, standard options can be used in aliases.\n"
8209
#: dummy/help_topics/standard-options/summary.txt:1
8210
msgid "Options that can be used with any command"
8213
#: dummy/help_topics/status-flags/detail.txt:1
8214
msgid "Status Flags"
8217
#: dummy/help_topics/status-flags/detail.txt:3
8219
"Status flags are used to summarise changes to the working tree in a concise\n"
8220
"manner. They are in the form::"
8223
#: dummy/help_topics/status-flags/detail.txt:6
8224
msgid " xxx <filename>"
8227
#: dummy/help_topics/status-flags/detail.txt:8
8228
msgid "where the columns' meanings are as follows."
8231
#: dummy/help_topics/status-flags/detail.txt:10
8232
msgid "Column 1 - versioning/renames::"
8235
#: dummy/help_topics/status-flags/detail.txt:12
8237
" + File versioned\n"
8238
" - File unversioned\n"
8241
" X File nonexistent (and unknown to bzr)\n"
8242
" C File has conflicts\n"
8243
" P Entry for a pending merge (not a file)"
8246
#: dummy/help_topics/status-flags/detail.txt:20
8247
msgid "Column 2 - contents::"
8250
#: dummy/help_topics/status-flags/detail.txt:22
8254
" K File kind changed\n"
8258
#: dummy/help_topics/status-flags/detail.txt:27
8259
msgid "Column 3 - execute::"
8262
#: dummy/help_topics/status-flags/detail.txt:29
8263
msgid " * The execute bit was changed\n"
8266
#: dummy/help_topics/status-flags/summary.txt:1
8267
msgid "Help on status flags"
8270
#: dummy/help_topics/sync-for-reconfigure/detail.txt:1
8271
msgid "Branches Out of Sync"
8274
#: dummy/help_topics/sync-for-reconfigure/detail.txt:3
8276
"When reconfiguring a checkout, tree or branch into a lightweight checkout,\n"
8277
"a local branch must be destroyed. (For checkouts, this is the local branch\n"
8278
"that serves primarily as a cache.) If the branch-to-be-destroyed does not\n"
8279
"have the same last revision as the new reference branch for the lightweight\n"
8280
"checkout, data could be lost, so Bazaar refuses."
8283
#: dummy/help_topics/sync-for-reconfigure/detail.txt:9
8284
msgid "How you deal with this depends on *why* the branches are out of sync."
8287
#: dummy/help_topics/sync-for-reconfigure/detail.txt:11
8289
"If you have a checkout and have done local commits, you can get back in "
8291
"by running \"bzr update\" (and possibly \"bzr commit\")."
8294
#: dummy/help_topics/sync-for-reconfigure/detail.txt:14
8296
"If you have a branch and the remote branch is out-of-date, you can push\n"
8297
"the local changes using \"bzr push\". If the local branch is out of date, "
8299
"can do \"bzr pull\". If both branches have had changes, you can merge, "
8301
"and then push your changes. If you decide that some of the changes aren't\n"
8302
"useful, you can \"push --overwrite\" or \"pull --overwrite\" instead.\n"
8305
#: dummy/help_topics/sync-for-reconfigure/summary.txt:1
8306
msgid "Steps to resolve \"out-of-sync\" when reconfiguring"
8309
#: dummy/help_topics/topics/summary.txt:1
8313
#: dummy/help_topics/url-special-chars/summary.txt:1
8314
msgid "Special character handling in URLs"
8317
#: dummy/help_topics/urlspec/summary.txt:1
8318
msgid "Supported transport protocols"
8321
#: dummy/help_topics/working-trees/detail.txt:1
8322
msgid "Working Trees"
8325
#: dummy/help_topics/working-trees/detail.txt:3
8327
"A working tree is the contents of a branch placed on disk so that you can\n"
8328
"see the files and edit them. The working tree is where you make changes to "
8330
"branch, and when you commit the current state of the working tree is the\n"
8331
"snapshot that is recorded in the commit."
8334
#: dummy/help_topics/working-trees/detail.txt:8
8336
"When you push a branch to a remote system, a working tree will not be\n"
8337
"created. If one is already present the files will not be updated. The\n"
8338
"branch information will be updated and the working tree will be marked\n"
8339
"as out-of-date. Updating a working tree remotely is difficult, as there\n"
8340
"may be uncommitted changes or the update may cause content conflicts that "
8342
"difficult to deal with remotely."
8345
#: dummy/help_topics/working-trees/detail.txt:15
8347
"If you have a branch with no working tree you can use the 'checkout' "
8349
"to create a working tree. If you run 'bzr checkout .' from the branch it "
8351
"create the working tree. If the branch is updated remotely, you can update "
8353
"working tree by running 'bzr update' in that directory."
8356
#: dummy/help_topics/working-trees/detail.txt:20
8358
"If you have a branch with a working tree that you do not want the 'remove-"
8360
"command will remove the tree if it is safe. This can be done to avoid the\n"
8361
"warning about the remote working tree not being updated when pushing to the\n"
8362
"branch. It can also be useful when working with a '--no-trees' repository\n"
8363
"(see 'bzr help repositories')."
8366
#: dummy/help_topics/working-trees/detail.txt:26
8368
"If you want to have a working tree on a remote machine that you push to you\n"
8369
"can either run 'bzr update' in the remote branch after each push, or use "
8371
"other method to update the tree during the push. There is an 'rspush' "
8373
"that will update the working tree using rsync as well as doing a push. "
8375
"is also a 'push-and-update' plugin that automates running 'bzr update' via "
8380
#: dummy/help_topics/working-trees/detail.txt:33
8381
msgid "Useful commands::"
8384
#: dummy/help_topics/working-trees/detail.txt:35
8386
" checkout Create a working tree when a branch does not have one.\n"
8387
" remove-tree Removes the working tree from a branch when it is safe to do "
8389
" update When a working tree is out of sync with its associated "
8391
" this will update the tree to match the branch.\n"
8394
#: dummy/help_topics/working-trees/summary.txt:1
8395
msgid "Information on working trees"
8398
#: en/help_topics/authentication.txt:1
8400
"Authentication Settings\n"
8401
"======================="
8404
#: en/help_topics/authentication.txt:4
8411
#: en/help_topics/authentication.txt:8
8413
"Many different authentication policies can be described in the\n"
8414
"``authentication.conf`` file but a particular user should need only a few\n"
8415
"definitions to cover his needs without having to specify a user and a "
8417
"for every branch he uses."
8420
#: en/help_topics/authentication.txt:13
8422
"The definitions found in this file are used to find the credentials to use "
8424
"a given url. The same credentials can generally be used for as many branches "
8426
"possible by grouping their declaration around the remote servers that need\n"
8427
"them. It's even possible to declare credentials that will be used by "
8432
#: en/help_topics/authentication.txt:19
8434
"The intent is to make this file as small as possible to minimize maintenance."
8437
#: en/help_topics/authentication.txt:21
8439
"Once the relevant credentials are declared in this file you may use branch "
8441
"without embedding passwords (security hazard) or even users (enabling "
8443
"of your urls with others)."
8446
#: en/help_topics/authentication.txt:25
8447
msgid "Instead of using::"
8450
#: en/help_topics/authentication.txt:27
8451
msgid " bzr branch ftp://joe:secret@host.com/path/to/my/branch"
8454
#: en/help_topics/authentication.txt:29
8455
msgid "you simply use::"
8458
#: en/help_topics/authentication.txt:31
8459
msgid " bzr branch ftp://host.com/path/to/my/branch"
8462
#: en/help_topics/authentication.txt:33
8464
"provided you have created the following ``authentication.conf`` file::"
8467
#: en/help_topics/authentication.txt:35
8473
" password=secret\n"
8477
#: en/help_topics/authentication.txt:42
8479
"Authentication definitions\n"
8480
"--------------------------"
8483
#: en/help_topics/authentication.txt:45
8485
"There are two kinds of authentication used by the various schemes supported "
8490
#: en/help_topics/authentication.txt:48
8491
msgid "1. user and password"
8494
#: en/help_topics/authentication.txt:50
8496
"``FTP`` needs a (``user``, ``password``) to authenticate against a ``host``\n"
8497
"``SFTP`` can use either a password or a host key to authenticate. However,\n"
8498
"ssh agents are a better, more secure solution. So we have chosen to not "
8500
"our own less secure method."
8503
#: en/help_topics/authentication.txt:55
8504
msgid "2. user, realm and password"
8507
#: en/help_topics/authentication.txt:57
8509
"``HTTP`` and ``HTTPS`` needs a (``user, realm, password``) to authenticate\n"
8510
"against a host. But, by using ``.htaccess`` files, for example, it is "
8512
"to define several (``user, realm, password``) for a given ``host``. So what "
8514
"really needed is (``user``, ``password``, ``host``, ``path``). The ``realm`` "
8516
"not taken into account in the definitions, but will displayed if bzr "
8518
"you for a password."
8521
#: en/help_topics/authentication.txt:64
8523
"``HTTP proxy`` can be handled as ``HTTP`` (or ``HTTPS``) by explicitly\n"
8524
"specifying the appropriate port."
8527
#: en/help_topics/authentication.txt:67
8529
"To take all schemes into account, the password will be deduced from a set "
8531
"authentication definitions (``scheme``, ``host``, ``port``, ``path``, "
8536
#: en/help_topics/authentication.txt:71
8538
" * ``scheme``: can be empty (meaning the rest of the definition can be "
8540
" for any scheme), ``SFTP`` and ``bzr+ssh`` should not be used here, "
8542
" should be used instead since this is the real scheme regarding\n"
8546
#: en/help_topics/authentication.txt:76
8547
msgid " * ``host``: can be empty (to act as a default for any host),"
8550
#: en/help_topics/authentication.txt:78
8552
" * ``port`` can be empty (useful when an host provides several servers for "
8554
" same scheme), only numerical values are allowed, this should be used "
8556
" when the server uses a port different than the scheme standard port,"
8559
#: en/help_topics/authentication.txt:82
8560
msgid " * ``path``: can be empty (FTP or SFTP will never user it),"
8563
#: en/help_topics/authentication.txt:84
8565
" * ``user``: can be empty (``bzr`` will defaults to python's\n"
8566
" ``getpass.get_user()``),"
8569
#: en/help_topics/authentication.txt:87
8571
" * ``password``: can be empty if you prefer to always be prompted for your\n"
8575
#: en/help_topics/authentication.txt:90
8577
"Multiple definitions can be provided and, for a given URL, bzr will select "
8579
"(``user`` [, ``password``]) based on the following rules :"
8582
#: en/help_topics/authentication.txt:93
8583
msgid " 1. the first match wins,"
8586
#: en/help_topics/authentication.txt:95
8587
msgid " 2. empty fields match everything,"
8590
#: en/help_topics/authentication.txt:97
8592
" 3. ``scheme`` matches even if decorators are used in the requested URL,"
8595
#: en/help_topics/authentication.txt:99
8597
" 4. ``host`` matches exactly or act as a domain if it starts with '.'\n"
8598
" (``project.bzr.sf.net`` will match ``.bzr.sf.net`` but "
8599
"``projectbzr.sf.net``\n"
8600
" will not match ``bzr.sf.net``)."
8603
#: en/help_topics/authentication.txt:103
8605
" 5. ``port`` matches if included in the requested URL (exact matches only)"
8608
#: en/help_topics/authentication.txt:105
8610
" 6. ``path`` matches if included in the requested URL (and by rule #2 "
8612
" empty paths will match any provided path)."
8615
#: en/help_topics/authentication.txt:110
8621
#: en/help_topics/authentication.txt:113
8623
"The general rules for :doc:`configuration files <configuration-help>`\n"
8624
"apply except for the variable policies."
8627
#: en/help_topics/authentication.txt:116
8628
msgid "Each section describes an authentication definition."
8631
#: en/help_topics/authentication.txt:118
8633
"The section name is an arbitrary string, only the ``DEFAULT`` value is "
8635
"and should appear as the *last* section."
8638
#: en/help_topics/authentication.txt:121
8639
msgid "Each section should define:"
8642
#: en/help_topics/authentication.txt:123
8643
msgid "* ``user``: the login to be used,"
8646
#: en/help_topics/authentication.txt:125
8647
msgid "Each section could define:"
8650
#: en/help_topics/authentication.txt:127
8651
msgid "* ``host``: the remote server,"
8654
#: en/help_topics/authentication.txt:129
8655
msgid "* ``port``: the port the server is listening,"
8658
#: en/help_topics/authentication.txt:131
8659
msgid "* ``path``: the branch location,"
8662
#: en/help_topics/authentication.txt:133
8663
msgid "* ``password``: the password."
8666
#: en/help_topics/authentication.txt:135
8673
#: en/help_topics/authentication.txt:139
8676
"Personal projects hosted outside\n"
8677
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
8680
#: en/help_topics/authentication.txt:143
8682
"All connections are done with the same ``user`` (the remote one for which "
8684
"default bzr one is not appropriate) and the password is always prompted "
8689
#: en/help_topics/authentication.txt:147
8691
" # Pet projects on hobby.net\n"
8693
" host=r.hobby.net\n"
8695
" password=obvious1234\n"
8702
" password=1essobV10us\n"
8705
" # Our local user is barbaz, on all remote sites we're known as "
8710
#: en/help_topics/authentication.txt:164
8713
"Source hosting provider\n"
8714
"~~~~~~~~~~~~~~~~~~~~~~~"
8717
#: en/help_topics/authentication.txt:168
8718
msgid "In the shp.net (fictitious) domain, each project has its own site::"
8721
#: en/help_topics/authentication.txt:170
8723
" [shpnet domain]\n"
8724
" # we use sftp, but ssh is the scheme used for authentication\n"
8726
" # The leading '.' ensures that 'shp.net' alone doesn't match\n"
8729
" # bzr don't support supplying a password for sftp,\n"
8730
" # consider using an ssh agent if you don't want to supply\n"
8731
" # a password interactively. (pageant, ssh-agent, etc)"
8734
#: en/help_topics/authentication.txt:180
8736
"HTTPS, SFTP servers and their proxy\n"
8737
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
8740
#: en/help_topics/authentication.txt:183
8742
"At company.com, the server hosting release and integration branches is "
8744
"proxy, and the two branches use different authentication policies::"
8747
#: en/help_topics/authentication.txt:186
8749
" [reference code]\n"
8751
" host=dev.company.com\n"
8757
#: en/help_topics/authentication.txt:193
8759
" # development branches on dev server\n"
8761
" scheme=ssh # bzr+ssh and sftp are available here\n"
8762
" host=dev.company.com\n"
8763
" path=/dev/integration\n"
8769
" host=proxy.company.com\n"
8771
" user=proxyuser1\n"
8772
" password=proxypass1"
8775
#: en/help_topics/authentication.txt:208
8778
"Planned enhancements\n"
8779
"--------------------"
8782
#: en/help_topics/authentication.txt:212
8784
"The following are not yet implemented but planned as parts of a work in\n"
8788
#: en/help_topics/authentication.txt:215
8789
msgid "* add a ``password_encoding`` field allowing:"
8792
#: en/help_topics/authentication.txt:217
8794
" - storing the passwords in various obfuscating encodings (base64 for one),"
8797
#: en/help_topics/authentication.txt:219
8798
msgid " - delegate password storage to plugins (.netrc for example)."
8801
#: en/help_topics/authentication.txt:221
8803
"* update the credentials when the user is prompted for user or password,"
8806
#: en/help_topics/authentication.txt:223
8807
msgid "* add a ``verify_certificates`` field for ``HTTPS``."
8810
#: en/help_topics/authentication.txt:225
8812
"The ``password_encoding`` and ``verify_certificates`` fields are recognized "
8814
"ignored in the actual implementation.\n"
8817
#: en/help_topics/bugs.txt:1
8818
msgid "Bug Tracker Settings"
8821
#: en/help_topics/bugs.txt:3
8823
"When making a commit, metadata about bugs fixed by that change can be\n"
8824
"recorded by using the ``--fixes`` option. For each bug marked as fixed, an\n"
8825
"entry is included in the 'bugs' revision property stating '<url> <status>'.\n"
8826
"(The only ``status`` value currently supported is ``fixed.``)"
8829
#: en/help_topics/bugs.txt:8
8831
"The ``--fixes`` option allows you to specify a bug tracker and a bug "
8833
"rather than a full URL. This looks like::"
8836
#: en/help_topics/bugs.txt:11
8837
msgid " bzr commit --fixes <tracker>:<id>"
8840
#: en/help_topics/bugs.txt:13 en/help_topics/configuration.txt:398
8844
#: en/help_topics/bugs.txt:15
8845
msgid " bzr commit --fixes <id>"
8848
#: en/help_topics/bugs.txt:17
8850
"where \"<tracker>\" is an identifier for the bug tracker, and \"<id>\" is "
8852
"identifier for that bug within the bugtracker, usually the bug number.\n"
8853
"If \"<tracker>\" is not specified the ``bugtracker`` set in the branch\n"
8854
"or global configuration is used."
8857
#: en/help_topics/bugs.txt:22
8859
"Bazaar knows about a few bug trackers that have many users. If\n"
8860
"you use one of these bug trackers then there is no setup required to\n"
8861
"use this feature, you just need to know the tracker identifier to use.\n"
8862
"These are the bugtrackers that are built in:"
8865
#: en/help_topics/bugs.txt:27
8867
" ============================ ============ ============\n"
8868
" URL Abbreviation Example\n"
8869
" ============================ ============ ============\n"
8870
" https://bugs.launchpad.net/ lp lp:12345\n"
8871
" http://bugs.debian.org/ deb deb:12345\n"
8872
" http://bugzilla.gnome.org/ gnome gnome:12345\n"
8873
" ============================ ============ ============"
8876
#: en/help_topics/bugs.txt:35
8878
"For the bug trackers not listed above configuration is required.\n"
8879
"Support for generating the URLs for any project using Bugzilla or Trac\n"
8880
"is built in, along with a template mechanism for other bugtrackers with\n"
8881
"simple URL schemes. If your bug tracker can't be described by one\n"
8882
"of the schemes described below then you can write a plugin to support\n"
8886
#: en/help_topics/bugs.txt:42
8888
"If you use Bugzilla or Trac, then you only need to set a configuration\n"
8889
"variable which contains the base URL of the bug tracker. These options\n"
8890
"can go into ``bazaar.conf``, ``branch.conf`` or into a branch-specific\n"
8891
"configuration section in ``locations.conf``. You can set up these values\n"
8892
"for each of the projects you work on."
8895
#: en/help_topics/bugs.txt:48
8897
"Note: As you provide a short name for each tracker, you can specify one or\n"
8898
"more bugs in one or more trackers at commit time if you wish."
8901
#: en/help_topics/bugs.txt:51
8907
#: en/help_topics/bugs.txt:54
8909
"Use ``bzr commit --fixes lp:2`` to record that this commit fixes bug 2."
8912
#: en/help_topics/bugs.txt:56
8914
"bugzilla_<tracker>_url\n"
8915
"----------------------"
8918
#: en/help_topics/bugs.txt:59
8920
"If present, the location of the Bugzilla bug tracker referred to by\n"
8921
"<tracker>. This option can then be used together with ``bzr commit\n"
8922
"--fixes`` to mark bugs in that tracker as being fixed by that commit. For\n"
8926
#: en/help_topics/bugs.txt:64
8927
msgid " bugzilla_squid_url = http://bugs.squid-cache.org"
8930
#: en/help_topics/bugs.txt:66
8932
"would allow ``bzr commit --fixes squid:1234`` to mark Squid's bug 1234 as\n"
8936
#: en/help_topics/bugs.txt:69
8938
"trac_<tracker>_url\n"
8939
"------------------"
8942
#: en/help_topics/bugs.txt:72
8944
"If present, the location of the Trac instance referred to by\n"
8945
"<tracker>. This option can then be used together with ``bzr commit\n"
8946
"--fixes`` to mark bugs in that tracker as being fixed by that commit. For\n"
8950
#: en/help_topics/bugs.txt:77
8951
msgid " trac_twisted_url = http://www.twistedmatrix.com/trac"
8954
#: en/help_topics/bugs.txt:79
8956
"would allow ``bzr commit --fixes twisted:1234`` to mark Twisted's bug 1234 "
8961
#: en/help_topics/bugs.txt:82
8963
"bugtracker_<tracker>_url\n"
8964
"------------------------"
8967
#: en/help_topics/bugs.txt:85
8969
"If present, the location of a generic bug tracker instance referred to by\n"
8970
"<tracker>. The location must contain an ``{id}`` placeholder,\n"
8971
"which will be replaced by a specific bug ID. This option can then be used\n"
8972
"together with ``bzr commit --fixes`` to mark bugs in that tracker as being\n"
8973
"fixed by that commit. For example::"
8976
#: en/help_topics/bugs.txt:91
8977
msgid " bugtracker_python_url = http://bugs.python.org/issue{id}"
8980
#: en/help_topics/bugs.txt:93
8982
"would allow ``bzr commit --fixes python:1234`` to mark bug 1234 in Python's\n"
8983
"Roundup bug tracker as fixed, or::"
8986
#: en/help_topics/bugs.txt:96
8988
" bugtracker_cpan_url = http://rt.cpan.org/Public/Bug/Display.html?id={id}"
8991
#: en/help_topics/bugs.txt:98
8993
"would allow ``bzr commit --fixes cpan:1234`` to mark bug 1234 in CPAN's\n"
8994
"RT bug tracker as fixed, or::"
8997
#: en/help_topics/bugs.txt:101
8998
msgid " bugtracker_hudson_url = http://issues.hudson-ci.org/browse/{id}"
9001
#: en/help_topics/bugs.txt:103
9003
"would allow ``bzr commit --fixes hudson:HUDSON-1234`` to mark bug HUDSON-"
9005
"in Hudson's JIRA bug tracker as fixed.\n"
9008
#: en/help_topics/commands.txt:1
9010
"add Add specified files or directories.\n"
9011
"alias Set/unset and display aliases.\n"
9012
"annotate Show the origin of each line in a file.\n"
9013
"bash-completion Generate a shell function for bash command line "
9015
" [bash_completion]\n"
9016
"bind Convert the current branch into a checkout of the "
9019
"branch Create a new branch that is a copy of an existing branch.\n"
9020
"branches List the branches available at the current location.\n"
9021
"break-lock Break a dead lock.\n"
9022
"cat Write the contents of a file as of a given revision to\n"
9023
" standard output.\n"
9024
"check Validate working tree structure, branch consistency and\n"
9025
" repository history.\n"
9026
"checkout Create a new checkout of an existing branch.\n"
9027
"clean-tree Remove unwanted files from working tree.\n"
9028
"commit Commit changes into a new revision.\n"
9029
"config Display, set or remove a configuration option.\n"
9030
"conflicts List files with conflicts.\n"
9031
"deleted List files deleted in the working tree.\n"
9032
"diff Show differences in the working tree, between revisions "
9035
"dpush Push into a different VCS without any custom bzr "
9037
"export Export current or past revision to a destination directory "
9040
"help Show help on a command or other topic.\n"
9041
"ignore Ignore specified files or patterns.\n"
9042
"ignored List ignored files and the patterns that matched them.\n"
9043
"info Show information about a working tree, branch or "
9045
"init Make a directory into a versioned branch.\n"
9046
"init-repository Create a shared repository for branches to share storage\n"
9048
"join Combine a tree into its containing tree.\n"
9049
"launchpad-login Show or set the Launchpad user ID. [launchpad]\n"
9050
"launchpad-mirror Ask Launchpad to mirror a branch now. [launchpad]\n"
9051
"launchpad-open Open a Launchpad branch page in your web browser. "
9053
"log Show historical log for a branch or subset of a branch.\n"
9054
"lp-find-proposal Find the proposal to merge this revision. [launchpad]\n"
9055
"lp-propose-merge Propose merging a branch on Launchpad. [launchpad]\n"
9056
"ls List files in a tree.\n"
9057
"merge Perform a three-way merge.\n"
9058
"missing Show unmerged/unpulled revisions between two branches.\n"
9059
"mkdir Create a new versioned directory.\n"
9060
"mv Move or rename a file.\n"
9061
"nick Print or set the branch nickname.\n"
9062
"pack Compress the data within a repository.\n"
9063
"plugins List the installed plugins.\n"
9064
"pull Turn this branch into a mirror of another branch.\n"
9065
"push Update a mirror of this branch.\n"
9066
"reconcile Reconcile bzr metadata in a branch.\n"
9067
"reconfigure Reconfigure the type of a bzr directory.\n"
9068
"register-branch Register a branch with launchpad.net. [launchpad]\n"
9069
"remerge Redo a merge.\n"
9070
"remove Remove files or directories.\n"
9071
"remove-branch Remove a branch.\n"
9072
"remove-tree Remove the working tree from a given branch/checkout.\n"
9073
"renames Show list of renamed files.\n"
9074
"resolve Mark a conflict as resolved.\n"
9075
"revert Revert files to a previous revision.\n"
9076
"revno Show current revision number.\n"
9077
"root Show the tree root directory.\n"
9078
"send Mail or create a merge-directive for submitting changes.\n"
9079
"serve Run the bzr server.\n"
9080
"shelve Temporarily set aside some changes from the current tree.\n"
9081
"sign-my-commits Sign all commits by a given committer.\n"
9082
"split Split a subdirectory of a tree into a separate tree.\n"
9083
"status Display status summary.\n"
9084
"switch Set the branch of a checkout and update.\n"
9085
"tag Create, remove or modify a tag naming a revision.\n"
9087
"testament Show testament (signing-form) of a revision.\n"
9088
"unbind Convert the current checkout into a regular branch.\n"
9089
"uncommit Remove the last committed revision.\n"
9090
"unshelve Restore shelved changes.\n"
9091
"update Update a working tree to a new revision.\n"
9092
"upgrade Upgrade a repository, branch or working tree to a newer\n"
9094
"verify-signatures Verify all commit signatures.\n"
9095
"version Show version of bzr.\n"
9096
"version-info Show version information about this tree.\n"
9097
"view Manage filtered views.\n"
9098
"whoami Show or set bzr user id.\n"
9101
#: en/help_topics/configuration.txt:1
9103
"Configuration Settings\n"
9104
"======================="
9107
#: en/help_topics/configuration.txt:4
9109
"Environment settings\n"
9110
"---------------------"
9113
#: en/help_topics/configuration.txt:7
9115
"While most configuration is handled by configuration files, some options\n"
9116
"which may be semi-permanent can also be controlled through the environment."
9119
#: en/help_topics/configuration.txt:10
9125
#: en/help_topics/configuration.txt:13
9126
msgid "Override the email id used by Bazaar. Typical format::"
9129
#: en/help_topics/configuration.txt:15
9130
msgid " \"John Doe <jdoe@example.com>\""
9133
#: en/help_topics/configuration.txt:17
9134
msgid "See also the ``email`` configuration option."
9137
#: en/help_topics/configuration.txt:19
9139
"BZR_PROGRESS_BAR\n"
9143
#: en/help_topics/configuration.txt:22
9145
"Override the progress display. Possible values are \"none\" or \"text\". "
9147
"the value is \"none\" then no progress bar is displayed. The value \"text\" "
9149
"the ordinary command line progress bar."
9152
#: en/help_topics/configuration.txt:26
9158
#: en/help_topics/configuration.txt:29
9160
"Control whether SIGQUIT behaves normally or invokes a breakin debugger."
9163
#: en/help_topics/configuration.txt:31
9165
"* 0 = Standard SIGQUIT behavior (normally, exit with a core dump)\n"
9166
"* 1 = Invoke breakin debugger (default)"
9169
#: en/help_topics/configuration.txt:34
9175
#: en/help_topics/configuration.txt:37
9176
msgid "Override the home directory used by Bazaar."
9179
#: en/help_topics/configuration.txt:39
9185
#: en/help_topics/configuration.txt:42
9186
msgid "Select a different SSH implementation."
9189
#: en/help_topics/configuration.txt:44
9195
#: en/help_topics/configuration.txt:47
9196
msgid "Control whether to launch a debugger on error."
9199
#: en/help_topics/configuration.txt:49
9201
"* 0 = Standard behavior\n"
9202
"* 1 = Launch debugger"
9205
#: en/help_topics/configuration.txt:52
9211
#: en/help_topics/configuration.txt:55
9212
msgid "Path to the Bazaar executable to use when using the bzr+ssh protocol."
9215
#: en/help_topics/configuration.txt:57
9216
msgid "See also the ``bzr_remote_path`` configuration option."
9219
#: en/help_topics/configuration.txt:59
9225
#: en/help_topics/configuration.txt:62
9226
msgid "Path to the editor Bazaar should use for commit messages, etc."
9229
#: en/help_topics/configuration.txt:64
9235
#: en/help_topics/configuration.txt:67
9237
"Location of the Bazaar log file. You can check the current location by\n"
9238
"running ``bzr version``."
9241
#: en/help_topics/configuration.txt:70
9243
"The log file contains debug information that is useful for diagnosing or\n"
9244
"reporting problems with Bazaar."
9247
#: en/help_topics/configuration.txt:73
9249
"Setting this to ``NUL`` on Windows or ``/dev/null`` on other platforms\n"
9250
"will disable logging."
9253
#: en/help_topics/configuration.txt:76
9260
#: en/help_topics/configuration.txt:80
9262
"The path to the plugins directory that Bazaar should use.\n"
9263
"If not set, Bazaar will search for plugins in:"
9266
#: en/help_topics/configuration.txt:83
9268
"* the user specific plugin directory (containing the ``user`` plugins),"
9271
#: en/help_topics/configuration.txt:85
9272
msgid "* the bzrlib directory (containing the ``core`` plugins),"
9275
#: en/help_topics/configuration.txt:87
9277
"* the site specific plugin directory if applicable (containing\n"
9278
" the ``site`` plugins)."
9281
#: en/help_topics/configuration.txt:90
9283
"If ``BZR_PLUGIN_PATH`` is set in any fashion, it will change the\n"
9284
"the way the plugin are searched. "
9287
#: en/help_topics/configuration.txt:93
9289
"As for the ``PATH`` variables, if multiple directories are\n"
9290
"specified in ``BZR_PLUGIN_PATH`` they should be separated by the\n"
9291
"platform specific appropriate character (':' on Unix,\n"
9295
#: en/help_topics/configuration.txt:98
9297
"By default if ``BZR_PLUGIN_PATH`` is set, it replaces searching\n"
9298
"in ``user``. However it will continue to search in ``core`` and\n"
9299
"``site`` unless they are explicitly removed."
9302
#: en/help_topics/configuration.txt:102
9304
"If you need to change the order or remove one of these\n"
9305
"directories, you should use special values:"
9308
#: en/help_topics/configuration.txt:105
9310
"* ``-user``, ``-core``, ``-site`` will remove the corresponding\n"
9311
" path from the default values,"
9314
#: en/help_topics/configuration.txt:108
9316
"* ``+user``, ``+core``, ``+site`` will add the corresponding path\n"
9317
" before the remaining default values (and also remove it from\n"
9318
" the default values)."
9321
#: en/help_topics/configuration.txt:112
9323
"Note that the special values 'user', 'core' and 'site' should be\n"
9324
"used literally, they will be substituted by the corresponding,\n"
9325
"platform specific, values."
9328
#: en/help_topics/configuration.txt:116
9330
"The examples below use ':' as the separator, windows users\n"
9334
#: en/help_topics/configuration.txt:119
9335
msgid "Overriding the default user plugin directory::"
9338
#: en/help_topics/configuration.txt:121
9339
msgid " BZR_PLUGIN_PATH='/path/to/my/other/plugins'"
9342
#: en/help_topics/configuration.txt:123
9343
msgid "Disabling the site directory while retaining the user directory::"
9346
#: en/help_topics/configuration.txt:125
9347
msgid " BZR_PLUGIN_PATH='-site:+user'"
9350
#: en/help_topics/configuration.txt:127
9351
msgid "Disabling all plugins (better achieved with --no-plugins)::"
9354
#: en/help_topics/configuration.txt:129
9355
msgid " BZR_PLUGIN_PATH='-user:-core:-site'"
9358
#: en/help_topics/configuration.txt:131
9359
msgid "Overriding the default site plugin directory::"
9362
#: en/help_topics/configuration.txt:133
9363
msgid " BZR_PLUGIN_PATH='/path/to/my/site/plugins:-site':+user"
9366
#: en/help_topics/configuration.txt:135
9368
"BZR_DISABLE_PLUGINS\n"
9369
"~~~~~~~~~~~~~~~~~~~"
9372
#: en/help_topics/configuration.txt:138
9374
"Under special circumstances (mostly when trying to diagnose a\n"
9375
"bug), it's better to disable a plugin (or several) rather than\n"
9376
"uninstalling them completely. Such plugins can be specified in\n"
9377
"the ``BZR_DISABLE_PLUGINS`` environment variable."
9380
#: en/help_topics/configuration.txt:143
9382
"In that case, ``bzr`` will stop loading the specified plugins and\n"
9383
"will raise an import error if they are explicitly imported (by\n"
9384
"another plugin that depends on them for example)."
9387
#: en/help_topics/configuration.txt:147
9388
msgid "Disabling ``myplugin`` and ``yourplugin`` is achieved by::"
9391
#: en/help_topics/configuration.txt:149
9392
msgid " BZR_DISABLE_PLUGINS='myplugin:yourplugin'"
9395
#: en/help_topics/configuration.txt:151
9401
#: en/help_topics/configuration.txt:154
9403
"When adding a new feature or working on a bug in a plugin,\n"
9404
"developers often need to use a specific version of a given\n"
9405
"plugin. Since python requires that the directory containing the\n"
9406
"code is named like the plugin itself this make it impossible to\n"
9407
"use arbitrary directory names (using a two-level directory scheme\n"
9408
"is inconvenient). ``BZR_PLUGINS_AT`` allows such directories even\n"
9409
"if they don't appear in ``BZR_PLUGIN_PATH`` ."
9412
#: en/help_topics/configuration.txt:162
9414
"Plugins specified in this environment variable takes precedence\n"
9415
"over the ones in ``BZR_PLUGIN_PATH``."
9418
#: en/help_topics/configuration.txt:165
9420
"The variable specified a list of ``plugin_name@plugin path``,\n"
9421
"``plugin_name`` being the name of the plugin as it appears in\n"
9422
"python module paths, ``plugin_path`` being the path to the\n"
9423
"directory containing the plugin code itself\n"
9424
"(i.e. ``plugins/myplugin`` not ``plugins``). Use ':' as the list\n"
9425
"separator, use ';' on windows."
9428
#: en/help_topics/configuration.txt:172
9434
#: en/help_topics/configuration.txt:175
9436
"Using a specific version of ``myplugin``:\n"
9437
"``BZR_PLUGINS_AT='myplugin@/home/me/bugfixes/123456-myplugin``"
9440
#: en/help_topics/configuration.txt:178
9446
#: en/help_topics/configuration.txt:181
9447
msgid "The path where Bazaar should look for shell plugin external commands."
9450
#: en/help_topics/configuration.txt:183
9453
"http_proxy, https_proxy\n"
9454
"~~~~~~~~~~~~~~~~~~~~~~~"
9457
#: en/help_topics/configuration.txt:187
9458
msgid "Specifies the network proxy for outgoing connections, for example::"
9461
#: en/help_topics/configuration.txt:189
9463
" http_proxy=http://proxy.example.com:3128/ \n"
9464
" https_proxy=http://proxy.example.com:3128/"
9467
#: en/help_topics/configuration.txt:192
9470
"Configuration files\n"
9471
"-------------------"
9474
#: en/help_topics/configuration.txt:196
9480
#: en/help_topics/configuration.txt:199
9482
"Configuration files are located in ``$HOME/.bazaar`` on Unix and\n"
9483
"``C:\\Documents and Settings\\<username>\\Application Data\\Bazaar\\2.0`` "
9485
"Windows. (You can check the location for your system by using\n"
9489
#: en/help_topics/configuration.txt:204
9490
msgid "There are three primary configuration files in this location:"
9493
#: en/help_topics/configuration.txt:206
9494
msgid "* ``bazaar.conf`` describes default configuration options,"
9497
#: en/help_topics/configuration.txt:208
9499
"* ``locations.conf`` describes configuration information for\n"
9500
" specific branch locations,"
9503
#: en/help_topics/configuration.txt:211
9505
"* ``authentication.conf`` describes credential information for\n"
9509
#: en/help_topics/configuration.txt:214
9511
"Each branch can also contain a configuration file that sets values specific\n"
9512
"to that branch. This file is found at ``.bzr/branch/branch.conf`` within "
9514
"branch. This file is visible to all users of a branch, if you wish to "
9516
"one of the values for a branch with a setting that is specific to you then "
9518
"can do so in ``locations.conf``."
9521
#: en/help_topics/configuration.txt:220
9527
#: en/help_topics/configuration.txt:223
9529
"An ini file has three types of contructs: section headers, section\n"
9530
"options and comments."
9533
#: en/help_topics/configuration.txt:226
9539
#: en/help_topics/configuration.txt:229
9541
"A comment is any line that starts with a \"#\" (sometimes called a \"hash\n"
9542
"mark\", \"pound sign\" or \"number sign\"). Comment lines are ignored by\n"
9543
"Bazaar when parsing ini files."
9546
#: en/help_topics/configuration.txt:233
9552
#: en/help_topics/configuration.txt:236
9554
"A section header is a word enclosed in brackets that starts at the begining\n"
9555
"of a line. A typical section header looks like this::"
9558
#: en/help_topics/configuration.txt:239
9562
#: en/help_topics/configuration.txt:241
9564
"The only valid section headers for bazaar.conf currently are [DEFAULT] and\n"
9565
"[ALIASES]. Section headers are case sensitive. The default section provides "
9567
"setting options which can be overridden with the branch config file."
9570
#: en/help_topics/configuration.txt:245
9572
"For ``locations.conf``, the options from the section with the\n"
9573
"longest matching section header are used to the exclusion of other\n"
9574
"potentially valid section headers. A section header uses the path for\n"
9575
"the branch as the section header. Some examples include::"
9578
#: en/help_topics/configuration.txt:250
9580
" [http://mybranches.isp.com/~jdoe/branchdir]\n"
9581
" [/home/jdoe/branches/]"
9584
#: en/help_topics/configuration.txt:253
9591
#: en/help_topics/configuration.txt:257
9593
"A section option resides within a section. A section option contains an\n"
9594
"option name, an equals sign and a value. For example::"
9597
#: en/help_topics/configuration.txt:260
9599
" email = John Doe <jdoe@isp.com>\n"
9600
" gpg_signing_key = Amy Pond <amy@example.com>"
9603
#: en/help_topics/configuration.txt:263
9605
"A option can reference other options by enclosing them in curly brackets::"
9608
#: en/help_topics/configuration.txt:265
9610
" my_branch_name = feature_x\n"
9611
" my_server = bzr+ssh://example.com\n"
9612
" push_location = {my_server}/project/{my_branch_name}"
9615
#: en/help_topics/configuration.txt:269
9621
#: en/help_topics/configuration.txt:272
9623
"Options defined in a section affect the named directory or URL plus\n"
9624
"any locations they contain. Policies can be used to change how an\n"
9625
"option value is interpreted for contained locations. Currently\n"
9626
"there are three policies available:"
9629
#: en/help_topics/configuration.txt:277
9632
" the value is interpreted the same for contained locations. This is\n"
9633
" the default behaviour.\n"
9635
" the value is only used for the exact location specified by the\n"
9638
" for contained locations, any additional path components are\n"
9639
" appended to the value."
9642
#: en/help_topics/configuration.txt:287
9644
"Policies are specified by keys with names of the form "
9645
"\"<option_name>:policy\".\n"
9646
"For example, to define the push location for a tree of branches, the\n"
9647
"following could be used::"
9650
#: en/help_topics/configuration.txt:291
9652
" [/top/location]\n"
9653
" push_location = sftp://example.com/location\n"
9654
" push_location:policy = appendpath"
9657
#: en/help_topics/configuration.txt:295
9659
"With this configuration, the push location for ``/top/location/branch1``\n"
9660
"would be ``sftp://example.com/location/branch1``."
9663
#: en/help_topics/configuration.txt:298
9665
"Section local options\n"
9666
"^^^^^^^^^^^^^^^^^^^^^"
9669
#: en/help_topics/configuration.txt:301
9671
"Some options are defined automatically inside a given section and can be\n"
9672
"refered to in this section only. "
9675
#: en/help_topics/configuration.txt:304
9676
msgid "For example, the ``appendpath`` policy can be used like this::"
9679
#: en/help_topics/configuration.txt:306
9681
" [/home/vila/src/bzr/bugs]\n"
9682
" mypush = lp:~vila/bzr\n"
9683
" mypush:policy=appendpath"
9686
#: en/help_topics/configuration.txt:310
9687
msgid "Using ``relpath`` to achieve the same result is done like this::"
9690
#: en/help_topics/configuration.txt:312
9692
" [/home/vila/src/bzr/bugs]\n"
9693
" mypush = lp:~vila/bzr/{relpath}"
9696
#: en/help_topics/configuration.txt:315
9698
"In both cases, when used in a directory like\n"
9699
"``/home/vila/src/bzr/bugs/832013-expand-in-stack`` we'll get::"
9702
#: en/help_topics/configuration.txt:318 en/help_topics/configuration.txt:329
9704
" $ bzr config mypush\n"
9705
" lp:~vila/bzr/832013-expand-in-stack"
9708
#: en/help_topics/configuration.txt:321
9709
msgid "Another such option is ``basename`` which can be used like this::"
9712
#: en/help_topics/configuration.txt:323
9714
" [/home/vila/src/bzr]\n"
9715
" mypush = lp:~vila/bzr/{basename}"
9718
#: en/help_topics/configuration.txt:326
9720
"When used in a directory like\n"
9721
"``/home/vila/src/bzr/bugs/832013-expand-in-stack`` we'll get::"
9724
#: en/help_topics/configuration.txt:332
9726
"Note that ``basename`` here refers to the base name of ``relpath`` which\n"
9727
"itself is defined as the relative path between the section name and the\n"
9728
"location it matches."
9731
#: en/help_topics/configuration.txt:336
9733
"When an option is local to a Section, it cannot be referred to from option\n"
9734
"values in any other section from the same ``Store`` nor from any other\n"
9738
#: en/help_topics/configuration.txt:340
9741
"The main configuration file, bazaar.conf\n"
9742
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
9745
#: en/help_topics/configuration.txt:344
9747
"``bazaar.conf`` allows two sections: ``[DEFAULT]`` and ``[ALIASES]``.\n"
9748
"The default section contains the default\n"
9749
"configuration options for all branches. The default section can be\n"
9750
"overriden by providing a branch-specific section in ``locations.conf``."
9753
#: en/help_topics/configuration.txt:349
9754
msgid "A typical ``bazaar.conf`` section often looks like the following::"
9757
#: en/help_topics/configuration.txt:351
9760
" email = John Doe <jdoe@isp.com>\n"
9761
" editor = /usr/bin/vim\n"
9762
" create_signatures = when-required"
9765
#: en/help_topics/configuration.txt:356
9768
"The branch location configuration file, locations.conf\n"
9769
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
9772
#: en/help_topics/configuration.txt:360
9774
"``locations.conf`` allows one to specify overriding settings for\n"
9775
"a specific branch. The format is almost identical to the default section in\n"
9776
"bazaar.conf with one significant change: The section header, instead of "
9778
"default, will be the path to a branch that you wish to override a value\n"
9779
"for. The '?' and '*' wildcards are supported::"
9782
#: en/help_topics/configuration.txt:366
9784
" [/home/jdoe/branches/nethack]\n"
9785
" email = Nethack Admin <nethack@nethack.com>"
9788
#: en/help_topics/configuration.txt:369
9790
" [http://hypothetical.site.com/branches/devel-branch]\n"
9791
" create_signatures = always"
9794
#: en/help_topics/configuration.txt:372
9796
"The authentication configuration file, authentication.conf\n"
9797
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
9800
#: en/help_topics/configuration.txt:375
9802
"``authentication.conf`` allows one to specify credentials for\n"
9803
"remote servers. This can be used for all the supported transports and any "
9805
"of bzr that requires authentication (smtp for example)."
9808
#: en/help_topics/configuration.txt:379
9810
"The syntax of the file obeys the same rules as the others except for the\n"
9811
"option policies which don't apply."
9814
#: en/help_topics/configuration.txt:382
9816
"For more information on the possible uses of the authentication "
9818
"file see :doc:`authentication-help`."
9821
#: en/help_topics/configuration.txt:385
9828
#: en/help_topics/configuration.txt:389
9834
#: en/help_topics/configuration.txt:392
9836
"A comma-separated list of debugging options to turn on. The same values\n"
9837
"can be used as with the -D command-line option (see `help global-options`).\n"
9841
#: en/help_topics/configuration.txt:396
9842
msgid " debug_flags = hpss"
9845
#: en/help_topics/configuration.txt:400
9846
msgid " debug_flags = hpss,evil"
9849
#: en/help_topics/configuration.txt:402
9855
#: en/help_topics/configuration.txt:405
9857
"The email address to use when committing a branch. Typically takes the form\n"
9861
#: en/help_topics/configuration.txt:408
9862
msgid " email = Full Name <account@hostname.tld>"
9865
#: en/help_topics/configuration.txt:410
9871
#: en/help_topics/configuration.txt:413
9873
"The path of the editor that you wish to use if *bzr commit* is run without\n"
9874
"a commit message. This setting is trumped by the environment variable\n"
9875
"``BZR_EDITOR``, and overrides the ``VISUAL`` and ``EDITOR`` environment\n"
9879
#: en/help_topics/configuration.txt:418
9885
#: en/help_topics/configuration.txt:421
9887
"The default log format to use. Standard log formats are ``long``, ``short``\n"
9888
"and ``line``. Additional formats may be provided by plugins. The default\n"
9889
"value is ``long``."
9892
#: en/help_topics/configuration.txt:425
9894
"check_signatures\n"
9898
#: en/help_topics/configuration.txt:428
9900
"Reserved for future use. These options will allow a policy for branches to\n"
9901
"require signatures."
9904
#: en/help_topics/configuration.txt:431
9907
" The gnupg signature for revisions must be present and must be valid."
9910
#: en/help_topics/configuration.txt:434
9913
" Do not check gnupg signatures of revisions."
9916
#: en/help_topics/configuration.txt:437
9919
" (default) If gnupg signatures for revisions are present, check them.\n"
9920
" Bazaar will fail if it finds a bad signature, but will not fail if\n"
9921
" no signature is present."
9924
#: en/help_topics/configuration.txt:442
9926
"create_signatures\n"
9930
#: en/help_topics/configuration.txt:445
9932
"Defines the behaviour of signing revisions on commits. By default bzr will "
9937
#: en/help_topics/configuration.txt:448
9940
" Sign every new revision that is committed. If the signing fails then "
9942
" commit will not be made."
9945
#: en/help_topics/configuration.txt:452
9948
" Reserved for future use."
9951
#: en/help_topics/configuration.txt:455
9954
" Reserved for future use."
9957
#: en/help_topics/configuration.txt:458
9959
"In future it is planned that ``when-required`` will sign newly\n"
9960
"committed revisions only when the branch requires them. ``never`` will "
9962
"to sign newly committed revisions, even if the branch requires signatures."
9965
#: en/help_topics/configuration.txt:462
9967
"dirstate.fdatasync\n"
9968
"~~~~~~~~~~~~~~~~~~"
9971
#: en/help_topics/configuration.txt:465
9973
"If true (default), working tree metadata changes are flushed through the\n"
9974
"OS buffers to physical disk. This is somewhat slower, but means data\n"
9975
"should not be lost if the machine crashes. See also repository.fdatasync."
9978
#: en/help_topics/configuration.txt:469
9984
#: en/help_topics/configuration.txt:472
9986
"The GnuPG user identity to use when signing commits. Can be an e-mail\n"
9987
"address, key fingerprint or full key ID. When unset or when set to\n"
9988
"\"default\" Bazaar will use the user e-mail set with ``whoami``."
9991
#: en/help_topics/configuration.txt:476
9997
#: en/help_topics/configuration.txt:479
9999
"Only useful in ``locations.conf``. Defines whether or not the\n"
10000
"configuration for this section applies to subdirectories:"
10003
#: en/help_topics/configuration.txt:482
10006
" (default) This section applies to subdirectories as well."
10009
#: en/help_topics/configuration.txt:485
10012
" This section only applies to the branch at this directory and not\n"
10013
" branches below it."
10016
#: en/help_topics/configuration.txt:489
10018
"gpg_signing_command\n"
10019
"~~~~~~~~~~~~~~~~~~~"
10022
#: en/help_topics/configuration.txt:492
10024
"(Default: \"gpg\"). Which program should be used to sign and check "
10029
#: en/help_topics/configuration.txt:495
10030
msgid " gpg_signing_command = /usr/bin/gnpg"
10033
#: en/help_topics/configuration.txt:497
10035
"The specified command must accept the options \"--clearsign\" and \"-u "
10039
#: en/help_topics/configuration.txt:499
10041
"bzr_remote_path\n"
10045
#: en/help_topics/configuration.txt:502
10047
"(Default: \"bzr\"). The path to the command that should be used to run the "
10049
"server for bzr. This value may only be specified in locations.conf, because:"
10052
#: en/help_topics/configuration.txt:505
10054
"- it's needed before branch.conf is accessible\n"
10055
"- allowing remote branch.conf files to specify commands would be a security\n"
10059
#: en/help_topics/configuration.txt:509
10060
msgid "It is overridden by the BZR_REMOTE_PATH environment variable."
10063
#: en/help_topics/configuration.txt:511
10069
#: en/help_topics/configuration.txt:514
10071
"(Default: \"localhost\"). SMTP server to use when Bazaar needs to send\n"
10072
"email, eg. with ``merge-directive --mail-to``, or the bzr-email plugin."
10075
#: en/help_topics/configuration.txt:517
10077
"smtp_username, smtp_password\n"
10078
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
10081
#: en/help_topics/configuration.txt:520
10083
"User and password to authenticate to the SMTP server. If smtp_username\n"
10084
"is set, and smtp_password is not, Bazaar will prompt for a password.\n"
10085
"These settings are only needed if the SMTP server requires authentication\n"
10089
#: en/help_topics/configuration.txt:525
10091
"locks.steal_dead\n"
10095
#: en/help_topics/configuration.txt:528
10097
"If set to true, bzr will automatically break locks held by processes from\n"
10098
"the same machine and user that are no longer alive. Otherwise, it will\n"
10099
"print a message and you can break the lock manually, if you are satisfied\n"
10100
"the object is no longer in use."
10103
#: en/help_topics/configuration.txt:533
10109
#: en/help_topics/configuration.txt:536
10111
"A mail client to use for sending merge requests.\n"
10112
"By default, bzr will try to use ``mapi`` on Windows. On other platforms, "
10114
"will try ``xdg-email``. If either of these fails, it will fall back to\n"
10118
#: en/help_topics/configuration.txt:541
10119
msgid "Supported values for specific clients:"
10122
#: en/help_topics/configuration.txt:543
10124
":claws: Use Claws. This skips a dialog for attaching files.\n"
10125
":evolution: Use Evolution.\n"
10126
":kmail: Use KMail.\n"
10127
":mutt: Use Mutt.\n"
10128
":thunderbird: Use Mozilla Thunderbird or Icedove. For Thunderbird/Icedove "
10130
" this works around some bugs that xdg-email doesn't handle."
10133
#: en/help_topics/configuration.txt:550
10134
msgid "Supported generic values are:"
10137
#: en/help_topics/configuration.txt:552
10139
":default: See above.\n"
10140
":editor: Use your editor to compose the merge request. This also uses\n"
10141
" your commit id, (see ``bzr whoami``), smtp_server and (optionally)\n"
10142
" smtp_username and smtp_password.\n"
10143
":mapi: Use your preferred e-mail client on Windows.\n"
10144
":xdg-email: Use xdg-email to run your preferred mail program"
10147
#: en/help_topics/configuration.txt:559
10149
"repository.fdatasync\n"
10150
"~~~~~~~~~~~~~~~~~~~~"
10153
#: en/help_topics/configuration.txt:562
10155
"If true (default), repository changes are flushed through the OS buffers\n"
10156
"to physical disk. This is somewhat slower, but means data should not be\n"
10157
"lost if the machine crashes. See also dirstate.fdatasync."
10160
#: en/help_topics/configuration.txt:566
10166
#: en/help_topics/configuration.txt:569
10168
"The branch you intend to submit your current work to. This is "
10170
"set by ``bzr send``, and is also used by the ``submit:`` revision spec. "
10172
"should usually be set on a per-branch or per-location basis."
10175
#: en/help_topics/configuration.txt:573
10181
#: en/help_topics/configuration.txt:576
10183
"A publically-accessible version of this branch (implying that this version "
10185
"not publically-accessible). Used (and set) by ``bzr send``."
10188
#: en/help_topics/configuration.txt:579
10190
"suppress_warnings\n"
10191
"~~~~~~~~~~~~~~~~~"
10194
#: en/help_topics/configuration.txt:582
10196
"A list of strings, each string represent a warning that can be emitted by\n"
10197
"bzr. Mentioning a warning in this list tells bzr to not emit it."
10200
#: en/help_topics/configuration.txt:585
10201
msgid "Valid values:"
10204
#: en/help_topics/configuration.txt:587
10206
"* ``format_deprecation``:\n"
10207
" whether the format deprecation warning is shown on repositories that "
10209
" using deprecated formats."
10212
#: en/help_topics/configuration.txt:591
10218
#: en/help_topics/configuration.txt:594
10220
"A format name for the default format used when creating branches. See "
10222
"help formats`` for possible values."
10225
#: en/help_topics/configuration.txt:597
10228
"Unicode options\n"
10232
#: en/help_topics/configuration.txt:601
10234
"output_encoding\n"
10238
#: en/help_topics/configuration.txt:604
10240
"A Python unicode encoding name for text output from bzr, such as log\n"
10241
"information. Values include: utf8, cp850, ascii, iso-8859-1. The default\n"
10242
"is the terminal encoding prefered by the operating system."
10245
#: en/help_topics/configuration.txt:608
10248
"Branch type specific options\n"
10249
"----------------------------"
10252
#: en/help_topics/configuration.txt:612
10254
"These options apply only to branches that use the ``dirstate-tags`` or\n"
10255
"later format. They\n"
10256
"are usually set in ``.bzr/branch/branch.conf`` automatically, but may be\n"
10257
"manually set in ``locations.conf`` or ``bazaar.conf``."
10260
#: en/help_topics/configuration.txt:617
10262
"append_revisions_only\n"
10263
"~~~~~~~~~~~~~~~~~~~~~"
10266
#: en/help_topics/configuration.txt:620
10268
"If set to \"True\" then revisions can only be appended to the log, not\n"
10269
"removed. A branch with this setting enabled can only pull from another\n"
10270
"branch if the other branch's log is a longer version of its own. This is\n"
10271
"normally set by ``bzr init --append-revisions-only``. If you set it\n"
10272
"manually, use either 'True' or 'False' (case-sensitive) to maintain\n"
10273
"compatibility with previous bzr versions (older than 2.2)."
10276
#: en/help_topics/configuration.txt:627
10278
"parent_location\n"
10282
#: en/help_topics/configuration.txt:630
10284
"If present, the location of the default branch for pull or merge. This "
10286
"is normally set when creating a branch, the first ``pull`` or by ``pull\n"
10290
#: en/help_topics/configuration.txt:634
10296
#: en/help_topics/configuration.txt:637
10298
"If present, the location of the default branch for push. This option\n"
10299
"is normally set by the first ``push`` or ``push --remember``."
10302
#: en/help_topics/configuration.txt:640
10308
#: en/help_topics/configuration.txt:643
10310
"If present, defines the ``--strict`` option default value for checking\n"
10311
"uncommitted changes before pushing."
10314
#: en/help_topics/configuration.txt:646
10320
#: en/help_topics/configuration.txt:649
10322
"If present, defines the ``--strict`` option default value for checking\n"
10323
"uncommitted changes before pushing into a different VCS without any\n"
10324
"custom bzr metadata."
10327
#: en/help_topics/configuration.txt:653
10333
#: en/help_topics/configuration.txt:656
10335
"The location that commits should go to when acting as a checkout.\n"
10336
"This option is normally set by ``bind``."
10339
#: en/help_topics/configuration.txt:659
10345
#: en/help_topics/configuration.txt:662
10347
"If set to \"True\", the branch should act as a checkout, and push each "
10349
"the bound_location. This option is normally set by ``bind``/``unbind``."
10352
#: en/help_topics/configuration.txt:665
10358
#: en/help_topics/configuration.txt:668
10360
"If present, defines the ``--strict`` option default value for checking\n"
10361
"uncommitted changes before sending a merge directive."
10364
#: en/help_topics/configuration.txt:671
10366
"add.maximum_file_size\n"
10367
"~~~~~~~~~~~~~~~~~~~~~"
10370
#: en/help_topics/configuration.txt:674
10372
"Defines the maximum file size the command line \"add\" operation will allow\n"
10373
"in recursive mode, with files larger than this value being skipped. You may "
10375
"specify this value as an integer (in which case it is interpreted as bytes), "
10377
"or you may specify the value using SI units, i.e. 10KB, 20MB, 1G. A value of "
10379
"will disable skipping."
10382
#: en/help_topics/configuration.txt:680
10384
"External Merge Tools\n"
10385
"--------------------"
10388
#: en/help_topics/configuration.txt:683
10390
"bzr.mergetool.<name>\n"
10391
"~~~~~~~~~~~~~~~~~~~~"
10394
#: en/help_topics/configuration.txt:686
10396
"Defines an external merge tool called <name> with the given command-line.\n"
10397
"Arguments containing spaces should be quoted using single or double quotes. "
10399
"executable may omit its path if it can be found on the PATH."
10402
#: en/help_topics/configuration.txt:690
10404
"The following markers can be used in the command-line to substitute "
10406
"involved in the merge conflict::"
10409
#: en/help_topics/configuration.txt:693
10411
" {base} file.BASE\n"
10412
" {this} file.THIS\n"
10413
" {other} file.OTHER\n"
10414
" {result} output file\n"
10415
" {this_temp} temp copy of file.THIS, used to overwrite output file if "
10420
#: en/help_topics/configuration.txt:702
10421
msgid " bzr.mergetool.kdiff3 = kdiff3 {base} {this} {other} -o {result}"
10424
#: en/help_topics/configuration.txt:704
10426
"bzr.default_mergetool\n"
10427
"~~~~~~~~~~~~~~~~~~~~~"
10430
#: en/help_topics/configuration.txt:707
10432
"Specifies which external merge tool (as defined above) should be selected "
10434
"default in tools such as ``bzr qconflicts``."
10437
#: en/help_topics/configuration.txt:712
10438
msgid " bzr.default_mergetool = kdiff3\n"
10441
#: en/help_topics/conflict-types.txt:1
10447
#: en/help_topics/conflict-types.txt:4
10449
"Some operations, like merge, revert and pull, modify the contents of your\n"
10450
"working tree. These modifications are programmatically generated, and so "
10452
"may conflict with the current state of your working tree. "
10455
#: en/help_topics/conflict-types.txt:8
10457
"When conflicts are present in your working tree (as shown by ``bzr\n"
10458
"conflicts``), you should resolve them and then inform bzr that the "
10460
"have been resolved."
10463
#: en/help_topics/conflict-types.txt:12
10465
"Resolving conflicts is sometimes not obvious. Either because the user that\n"
10466
"should resolve them is not the one responsible for their occurrence, as is "
10468
"case when merging other people's work or because some conflicts are "
10470
"in a way that is not easy to understand."
10473
#: en/help_topics/conflict-types.txt:17
10475
"Bazaar tries to avoid conflicts ; its aim is to ask you to resolve the\n"
10476
"conflict if and only if there's an actual conceptual conflict in the source\n"
10477
"tree. Because Bazaar doesn't understand the real meaning of the files "
10479
"versioned, it can, when faced with ambiguities, fall short in either "
10481
"trying to resolve the conflict itself. Many kinds of changes can be "
10483
"programmatically, but sometimes only a human can determine the right thing "
10488
#: en/help_topics/conflict-types.txt:25
10490
"When Bazaar generates a conflict, it adds information into the working tree "
10492
"present the conflicting versions, and it's up to you to find the correct\n"
10496
#: en/help_topics/conflict-types.txt:29
10497
msgid "Whatever the conflict is, resolving it is roughly done in two steps:"
10500
#: en/help_topics/conflict-types.txt:31
10502
"1. Modify the working tree content so that the conflicted item is now in "
10504
" state you want to keep, then"
10507
#: en/help_topics/conflict-types.txt:34
10509
"2. Inform Bazaar that the conflict is now solved and ask to cleanup any\n"
10510
" remaining generated information (``bzr resolve <item>``)."
10513
#: en/help_topics/conflict-types.txt:37
10515
"For most conflict types, there are some obvious ways to modify the working\n"
10516
"tree and put it into the desired state. For some types of conflicts, Bazaar\n"
10517
"itself already made a choice, when possible."
10520
#: en/help_topics/conflict-types.txt:41
10522
"Yet, whether Bazaar makes a choice or not, there are some other simple but\n"
10523
"different ways to resolve the conflict."
10526
#: en/help_topics/conflict-types.txt:44
10528
"Each type of conflict is explained below, and the action which must be done "
10530
"resolve the conflict is outlined."
10533
#: en/help_topics/conflict-types.txt:47
10535
"Various actions are available depending on the kind of conflict, for some "
10537
"these actions, Bazaar can provide some help. In the end you should at least\n"
10538
"inform Bazaar that you're done with the conflict with::"
10541
#: en/help_topics/conflict-types.txt:51
10542
msgid " ``bzr resolve FILE --action=done'"
10545
#: en/help_topics/conflict-types.txt:53
10547
"Note that this is the default action when a single file is involved so you "
10552
#: en/help_topics/conflict-types.txt:56
10553
msgid " ``bzr resolve FILE``"
10556
#: en/help_topics/conflict-types.txt:58
10557
msgid "See ``bzr help resolve`` for more details."
10560
#: en/help_topics/conflict-types.txt:60
10566
#: en/help_topics/conflict-types.txt:63 en/help_topics/conflict-types.txt:120
10567
#: en/help_topics/conflict-types.txt:151 en/help_topics/conflict-types.txt:175
10568
#: en/help_topics/conflict-types.txt:198 en/help_topics/conflict-types.txt:213
10569
#: en/help_topics/conflict-types.txt:239 en/help_topics/conflict-types.txt:281
10570
#: en/help_topics/conflict-types.txt:303 en/help_topics/conflict-types.txt:339
10571
msgid "Typical message::"
10574
#: en/help_topics/conflict-types.txt:65
10575
msgid " Text conflict in FILE"
10578
#: en/help_topics/conflict-types.txt:67
10580
"These are produced when a text merge cannot completely reconcile two sets "
10582
"text changes. Bazaar will emit files for each version with the extensions\n"
10583
"THIS, OTHER, and BASE. THIS is the version of the file from the target "
10585
"i.e. the tree that you are merging changes into. OTHER is the version that "
10587
"are merging into the target. BASE is an older version that is used as a "
10592
#: en/help_topics/conflict-types.txt:74
10594
"In the main copy of the file, Bazaar will include all the changes that it\n"
10595
"could reconcile, and any un-reconciled conflicts are surrounded by\n"
10596
"\"herringbone\" markers like ``<<<<<<<``."
10599
#: en/help_topics/conflict-types.txt:78
10601
"Say the initial text is \"The project leader released it.\", and THIS "
10603
"to \"Martin Pool released it.\", while OTHER modifies it to \"The project "
10605
"released Bazaar.\" A conflict would look like this::"
10608
#: en/help_topics/conflict-types.txt:82
10611
" Martin Pool released it.\n"
10613
" The project leader released Bazaar.\n"
10614
" >>>>>>> MERGE-SOURCE"
10617
#: en/help_topics/conflict-types.txt:88
10618
msgid "The correct resolution would be \"Martin Pool released Bazaar.\""
10621
#: en/help_topics/conflict-types.txt:90
10623
"You can handle text conflicts either by editing the main copy of the file,\n"
10624
"or by invoking external tools on the THIS, OTHER and BASE versions. It's\n"
10625
"worth mentioning that resolving text conflicts rarely involves picking one\n"
10626
"set of changes over the other (but see below when you encounter these\n"
10627
"cases). More often, the two sets of changes must be intelligently combined."
10630
#: en/help_topics/conflict-types.txt:96
10632
"If you edit the main copy, be sure to remove the herringbone markers. When\n"
10633
"you are done editing, the file should look like it never had a conflict, and "
10638
#: en/help_topics/conflict-types.txt:100
10640
"When you have resolved text conflicts, just run ``bzr resolve --auto``, and\n"
10641
"Bazaar will auto-detect which conflicts you have resolved."
10644
#: en/help_topics/conflict-types.txt:103
10646
"When the conflict is resolved, Bazaar deletes the previously generated\n"
10647
"``.BASE``, ``.THIS`` and ``.OTHER`` files if they are still present in the\n"
10651
#: en/help_topics/conflict-types.txt:107
10654
"When you want to pick one set of changes over the other, you can use ``bzr\n"
10655
"resolve`` with one of the following actions:"
10658
#: en/help_topics/conflict-types.txt:111
10660
"* ``--action=take-this`` will issue ``mv FILE.THIS FILE``,\n"
10661
"* ``--action=take-other`` will issue ``mv FILE.OTHER FILE``."
10664
#: en/help_topics/conflict-types.txt:114
10666
"Note that if you have modified ``FILE.THIS`` or ``FILE.OTHER``, these\n"
10667
"modifications will be taken into account."
10670
#: en/help_topics/conflict-types.txt:117
10672
"Content conflicts\n"
10673
"-----------------"
10676
#: en/help_topics/conflict-types.txt:122
10677
msgid " Contents conflict in FILE"
10680
#: en/help_topics/conflict-types.txt:124
10682
"This conflict happens when there are conflicting changes in the working "
10684
"and the merge source, but the conflicted items are not text files. They "
10686
"be binary files, or symlinks, or directories. It can even happen with "
10688
"that are deleted on one side, and modified on the other."
10691
#: en/help_topics/conflict-types.txt:129
10693
"Like text conflicts, Bazaar will emit THIS, OTHER and BASE files. (They may "
10695
"regular files, symlinks or directories). But it will not include a \"main "
10697
"of the file with herringbone conflict markers. It will appear that the "
10699
"copy\" has been renamed to THIS or OTHER."
10702
#: en/help_topics/conflict-types.txt:134 en/help_topics/conflict-types.txt:182
10704
"To resolve that kind of conflict, you should rebuild FILE from either "
10706
"or a combination of both."
10709
#: en/help_topics/conflict-types.txt:137 en/help_topics/conflict-types.txt:185
10710
#: en/help_topics/conflict-types.txt:226 en/help_topics/conflict-types.txt:252
10711
#: en/help_topics/conflict-types.txt:291 en/help_topics/conflict-types.txt:326
10712
#: en/help_topics/conflict-types.txt:361
10713
msgid "``bzr resolve`` recognizes the following actions:"
10716
#: en/help_topics/conflict-types.txt:139
10718
"* ``--action=take-this`` will issue ``bzr mv FILE.THIS FILE``,\n"
10719
"* ``--action=take-other`` will issue ``bzr mv FILE.OTHER FILE``,\n"
10720
"* ``--action=done`` will just mark the conflict as resolved."
10723
#: en/help_topics/conflict-types.txt:143
10725
"Any action will also delete the previously generated ``.BASE``, ``.THIS`` "
10727
"``.OTHER`` files if they are still present in the working tree."
10730
#: en/help_topics/conflict-types.txt:146 en/help_topics/conflict-types.txt:193
10731
#: en/help_topics/conflict-types.txt:234 en/help_topics/conflict-types.txt:276
10732
#: en/help_topics/conflict-types.txt:298 en/help_topics/conflict-types.txt:334
10733
#: en/help_topics/conflict-types.txt:369
10735
"Bazaar cannot auto-detect when conflicts of this kind have been resolved."
10738
#: en/help_topics/conflict-types.txt:148
10744
#: en/help_topics/conflict-types.txt:153
10746
" Conflicting tags:\n"
10750
#: en/help_topics/conflict-types.txt:156
10752
"When pulling from or pushing to another branch, Bazaar informs you about "
10754
"that conflict between the two branches; that is the same tag points to two\n"
10755
"different revisions. You need not resolve these conflicts, but subsequent\n"
10756
"uses of pull or push will result in the same message."
10759
#: en/help_topics/conflict-types.txt:161
10761
"To resolve the conflict, you must apply the correct tags to either the "
10763
"branch or the source branch as appropriate. Use \"bzr tags --show-ids -d\n"
10764
"SOURCE_URL\" to see the tags in the source branch. If you want to make the\n"
10765
"target branch's tags match the source branch, then in the target branch do\n"
10766
"``bzr tag --force -r revid:REVISION_ID CONFLICTING_TAG`` for each of the\n"
10767
"CONFLICTING_TAGs, where REVISION_ID comes from the list of tags in the "
10769
"branch. You need not call \"bzr resolve\" after doing this. To resolve in\n"
10770
"favor of the target branch, you need to similarly use ``tag --force`` in "
10772
"source branch. (Note that pulling or pushing using --overwrite will "
10774
"all tags as well.)"
10777
#: en/help_topics/conflict-types.txt:172
10779
"Duplicate paths\n"
10783
#: en/help_topics/conflict-types.txt:177
10784
msgid " Conflict adding file FILE. Moved existing file to FILE.moved."
10787
#: en/help_topics/conflict-types.txt:179
10789
"Sometimes Bazaar will attempt to create a file using a pathname that has\n"
10790
"already been used. The existing file will be renamed to \"FILE.moved\". "
10793
#: en/help_topics/conflict-types.txt:187
10795
"* ``--action=take-this`` will issue ``bzr rm FILE ; bzr mv FILE.moved "
10797
"* ``--action=take-other`` will issue ``bzr rm FILE.moved``,\n"
10798
"* ``--action=done`` will just mark the conflict as resolved."
10801
#: en/help_topics/conflict-types.txt:191
10803
"Note that you must get rid of FILE.moved before using ``--action=done``."
10806
#: en/help_topics/conflict-types.txt:195
10808
"Unversioned parent\n"
10809
"------------------"
10812
#: en/help_topics/conflict-types.txt:200
10814
" Conflict because FILE is not versioned, but has versioned children."
10817
#: en/help_topics/conflict-types.txt:202
10819
"Sometimes Bazaar will attempt to create a file whose parent directory is "
10821
"versioned. This happens when the directory has been deleted in the target,\n"
10822
"but has a new child in the source, or vice versa. In this situation, "
10824
"will version the parent directory as well. Resolving this issue depends\n"
10825
"very much on the particular scenario. You may wish to rename or delete "
10827
"the file or the directory. When you are satisfied, you can run \"bzr "
10829
"FILE\" to mark the conflict as resolved."
10832
#: en/help_topics/conflict-types.txt:210
10838
#: en/help_topics/conflict-types.txt:215
10839
msgid " Conflict adding files to FILE. Created directory."
10842
#: en/help_topics/conflict-types.txt:217
10844
"This happens when a directory has been deleted in the target, but has new\n"
10845
"children in the source. This is similar to the \"unversioned parent\" "
10847
"except that the parent directory does not *exist*, instead of just being\n"
10848
"unversioned. In this situation, Bazaar will create the missing parent.\n"
10849
"Resolving this issue depends very much on the particular scenario."
10852
#: en/help_topics/conflict-types.txt:223 en/help_topics/conflict-types.txt:249
10854
"To resolve that kind of conflict, you should either remove or rename the\n"
10855
"children or the directory or a combination of both."
10858
#: en/help_topics/conflict-types.txt:228
10860
"* ``--action=take-this`` will issue ``bzr rm directory`` including the\n"
10862
"* ``--action=take-other`` will acknowledge Bazaar choice to keep the "
10864
" and restoring the directory,\n"
10865
"* ``--action=done`` will just mark the conflict as resolved."
10868
#: en/help_topics/conflict-types.txt:236
10870
"Deleting parent\n"
10874
#: en/help_topics/conflict-types.txt:241
10875
msgid " Conflict: can't delete DIR because it is not empty. Not deleting."
10878
#: en/help_topics/conflict-types.txt:243
10880
"This is the opposite of \"missing parent\". A directory is deleted in the\n"
10881
"source, but has new children in the target (either because a directory\n"
10882
"deletion is merged or because the merge introduce new children). Bazaar\n"
10883
"will retain the directory. Resolving this issue depends very much on the\n"
10884
"particular scenario."
10887
#: en/help_topics/conflict-types.txt:254
10889
"* ``--action=take-this`` will acknowledge Bazaar choice to keep the "
10893
#: en/help_topics/conflict-types.txt:256
10895
"* ``--action=take-other`` will issue ``bzr rm directory`` including the \n"
10899
#: en/help_topics/conflict-types.txt:259
10900
msgid "* ``--action=done`` will just mark the conflict as resolved."
10903
#: en/help_topics/conflict-types.txt:261
10905
"Note that when merging a directory deletion, if unversioned files are\n"
10906
"present, they become potential orphans has they don't have a directory\n"
10910
#: en/help_topics/conflict-types.txt:265
10912
"Handling such orphans, *before* the conflict is created, is controlled by\n"
10913
"setting the ``bzr.transform.orphan_policy`` configuration option."
10916
#: en/help_topics/conflict-types.txt:268
10917
msgid "There are two possible values for this option:"
10920
#: en/help_topics/conflict-types.txt:270
10922
"* ``conflict`` (the default): will leave the orphans in place and\n"
10923
" generate a conflicts,"
10926
#: en/help_topics/conflict-types.txt:273
10928
"* ``move``: will move the orphans to a ``bzr-orphans`` directory at the "
10930
" of the working tree with names like ``<file>.~#~``."
10933
#: en/help_topics/conflict-types.txt:278
10939
#: en/help_topics/conflict-types.txt:283
10940
msgid " Path conflict: PATH1 / PATH2"
10943
#: en/help_topics/conflict-types.txt:285
10945
"This happens when the source and target have each modified the name or "
10947
"directory of a file. Bazaar will use the path elements from the source."
10950
#: en/help_topics/conflict-types.txt:288
10952
"To resolve that kind of conflict, you just have to decide what name should "
10954
"retained for the file involved."
10957
#: en/help_topics/conflict-types.txt:293
10959
"* ``--action=take-this`` will revert Bazaar choice and keep ``PATH1`` by\n"
10960
" issuing ``bzr mv PATH2 PATH1``,\n"
10961
"* ``--action=take-other`` will acknowledge Bazaar choice of keeping "
10963
"* ``--action=done`` will just mark the conflict as resolved."
10966
#: en/help_topics/conflict-types.txt:300
10972
#: en/help_topics/conflict-types.txt:305
10973
msgid " Conflict moving FILE into DIRECTORY. Cancelled move."
10976
#: en/help_topics/conflict-types.txt:307
10978
"This happens when the source and the target have each moved directories, so\n"
10979
"that, if the change could be applied, a directory would be contained by "
10984
#: en/help_topics/conflict-types.txt:311
10987
" $ bzr mkdir white\n"
10988
" $ bzr mkdir black\n"
10989
" $ bzr commit -m \"BASE\"\n"
10990
" $ bzr branch . ../other\n"
10991
" $ bzr mv white black\n"
10992
" $ bzr commit -m \"THIS\"\n"
10993
" $ bzr mv ../other/black ../other/white\n"
10994
" $ bzr commit ../other -m \"OTHER\"\n"
10995
" $ bzr merge ../other"
10998
#: en/help_topics/conflict-types.txt:322
11000
"In this situation, Bazaar will cancel the move, and leave ``white`` in\n"
11001
"``black``. To resolve that kind of conflict, you just have to decide what\n"
11002
"name should be retained for the directories involved."
11005
#: en/help_topics/conflict-types.txt:328
11007
"* ``--action=take-this`` will acknowledge Bazaar choice of leaving ``white`` "
11010
"* ``--action=take-other`` will revert Bazaar choice and move ``black`` in\n"
11011
" ``white`` by issuing ``bzr mv black/white white ; bzr mv black white``,\n"
11012
"* ``--action=done`` will just mark the conflict as resolved."
11015
#: en/help_topics/conflict-types.txt:336
11017
"Non-directory parent\n"
11018
"--------------------"
11021
#: en/help_topics/conflict-types.txt:341
11023
" Conflict: foo.new is not a directory, but has files in it.\n"
11024
" Created directory."
11027
#: en/help_topics/conflict-types.txt:344
11029
"This happens when one side has added files to a directory, and the other "
11031
"has changed the directory into a file or symlink. For example::"
11034
#: en/help_topics/conflict-types.txt:347
11037
" $ bzr mkdir foo\n"
11038
" $ bzr commit -m \"BASE\"\n"
11039
" $ bzr branch . ../other\n"
11042
" $ bzr commit -m \"THIS\"\n"
11043
" $ bzr mkdir ../other/foo/bar\n"
11044
" $ bzr commit ../other -m \"OTHER\"\n"
11045
" $ bzr merge ../other"
11048
#: en/help_topics/conflict-types.txt:358
11050
"To resolve that kind of conflict, you have to decide what name should be\n"
11051
"retained for the file, directory or symlink involved."
11054
#: en/help_topics/conflict-types.txt:363
11056
"* ``--action=take-this`` will issue ``bzr rm --force foo.new`` and \n"
11057
" ``bzr add foo``,\n"
11058
"* ``--action=take-other`` will issue ``bzr rm --force foo`` and \n"
11059
" ``bzr mv foo.new foo``,\n"
11060
"* ``--action=done`` will just mark the conflict as resolved."
11063
#: en/help_topics/conflict-types.txt:371
11065
"MalformedTransform\n"
11066
"------------------"
11069
#: en/help_topics/conflict-types.txt:374
11071
"It is possible (though very rare) for Bazaar to raise a MalformedTransform\n"
11072
"exception. This means that Bazaar encountered a filesystem conflict that it "
11074
"unable to resolve. This usually indicates a bug. Please let us know if "
11076
"encounter this. Our bug tracker is at https://launchpad.net/bzr/+bugs\n"
11079
#: en/help_topics/content-filters.txt:1
11081
"Content Filters\n"
11085
#: en/help_topics/content-filters.txt:4
11087
"Content formats\n"
11091
#: en/help_topics/content-filters.txt:7
11093
"Bazaar's content filtering allows you to store files in a different\n"
11094
"format from the copy in your working tree. This lets you, or your\n"
11095
"co-developers, use Windows development tools that expect CRLF files\n"
11096
"on projects that use other line-ending conventions. Among other things,\n"
11097
"content filters also let Unix developers more easily work on projects\n"
11098
"using Windows line-ending conventions, keyword expansion/compression,\n"
11099
"and trailing spaces on lines in text files to be implicitly stripped\n"
11103
#: en/help_topics/content-filters.txt:16
11104
msgid "To generalize, there are two content formats supported by Bazaar:"
11107
#: en/help_topics/content-filters.txt:18
11109
"* a canonical format - how files are stored internally\n"
11110
"* a convenience format - how files are created in a working tree."
11113
#: en/help_topics/content-filters.txt:21
11116
"Format conversion\n"
11117
"-----------------"
11120
#: en/help_topics/content-filters.txt:25
11122
"The conversion between these formats is done by content filters.\n"
11123
"A content filter has two parts:"
11126
#: en/help_topics/content-filters.txt:28
11128
"* a read converter - converts from convenience to canonical format\n"
11129
"* a write converter - converts from canonical to convenience format."
11132
#: en/help_topics/content-filters.txt:31
11134
"Many of these converters will provide *round-trip* conversion,\n"
11135
"i.e. applying the read converter followed by the write converter\n"
11136
"gives back the original content. However, others may provide an\n"
11137
"asymmetric conversion. For example, a read converter might strip\n"
11138
"trailing whitespace off lines in source code while the matching\n"
11139
"write converter might pass content through unchanged."
11142
#: en/help_topics/content-filters.txt:38
11145
"Enabling content filters\n"
11146
"------------------------"
11149
#: en/help_topics/content-filters.txt:42
11151
"Content filters are typically provided by plugins, so the first step\n"
11152
"in using them is to install the relevant plugins and read their\n"
11153
"documentation. Some plugins may be very specific about which files\n"
11154
"they filter, e.g. only files ending in ``.java`` or ``.php``.\n"
11155
"In other cases, the plugin may leave it in the user's hands to\n"
11156
"define which files are to be filtered. This is typically done\n"
11157
"using rule-based preferences. See ``bzr help rules`` for general\n"
11158
"information about defining these."
11161
#: en/help_topics/content-filters.txt:51
11164
"Impact on commands\n"
11165
"------------------"
11168
#: en/help_topics/content-filters.txt:55
11170
"Read converters are only applied to commands that read content from\n"
11171
"a working tree, e.g. status, diff and commit. For example, ``bzr diff``\n"
11172
"will apply read converters to files in the working tree, then compare\n"
11173
"the results to the content last committed."
11176
#: en/help_topics/content-filters.txt:60
11178
"Write converters are only applied by commands that **create files in a\n"
11179
"working tree**, e.g. branch, checkout, update. If you wish to see the\n"
11180
"canonical format of a file or tree, use ``bzr cat`` or ``bzr export``\n"
11184
#: en/help_topics/content-filters.txt:65
11186
"Note: ``bzr commit`` does not implicitly apply write converters after\n"
11187
"comitting files. If this makes sense for a given plugin providing\n"
11188
"a content filter, the plugin can usually achieve this effect by using a\n"
11189
"``start_commit`` or ``post_commit`` hook say. See :doc:`hooks-help`\n"
11190
"for more information on hooks."
11193
#: en/help_topics/content-filters.txt:71
11196
"Refreshing your working tree\n"
11197
"----------------------------"
11200
#: en/help_topics/content-filters.txt:75
11202
"For performance reasons, Bazaar caches the timestamps of files in\n"
11203
"a working tree, and assumes files are unchanged if their timestamps\n"
11204
"match the cached values. As a consequence, there are times when\n"
11205
"you may need to explicitly ask for content filtering to be reapplied\n"
11206
"in one or both directions, e.g. after installing or reconfiguring\n"
11207
"plugins providing it."
11210
#: en/help_topics/content-filters.txt:82
11211
msgid "Here are some general guidelines for doing this:"
11214
#: en/help_topics/content-filters.txt:84
11216
" * To reapply read converters, ``touch`` files, i.e. update their\n"
11217
" timestamp. Operations like ``bzr status`` should then reapply the\n"
11218
" relevant read converters and compare the end result with the\n"
11219
" canonical format."
11222
#: en/help_topics/content-filters.txt:89
11224
" * To reapply write converters, ensure there are no local changes,\n"
11225
" delete the relevant files and run ``bzr revert`` on those files."
11228
#: en/help_topics/content-filters.txt:92
11230
"Note: In the future, it is likely that additional options will be added\n"
11231
"to commands to make this refreshing process faster and safer.\n"
11234
#: en/help_topics/current-formats.txt:1
11235
msgid "Current Storage Formats"
11238
#: en/help_topics/current-formats.txt:3
11241
" (native) (default) Format for the bzr 2.0 series. Uses group-\n"
11242
" compress storage. Provides rich roots which are a one-way\n"
11246
#: en/help_topics/current-formats.txt:8 en/help_topics/other-formats.txt:17
11249
"See :doc:`formats-help` for more about storage formats."
11252
#: en/help_topics/debug-flags.txt:1
11258
#: en/help_topics/debug-flags.txt:4
11260
"These flags can be passed on the bzr command line or (without the ``-D``\n"
11261
"prefix) put in the ``debug_flags`` variable in ``bazaar.conf``."
11264
#: en/help_topics/debug-flags.txt:7
11266
"-Dauth Trace authentication sections used.\n"
11267
"-Dbytes Print out how many bytes were transferred\n"
11268
"-Ddirstate Trace dirstate activity (verbose!)\n"
11269
"-Derror Instead of normal error handling, always print a "
11272
"-Devil Capture call sites that do expensive or badly-scaling\n"
11274
"-Dfetch Trace history copying between repositories.\n"
11275
"-Dfilters Emit information for debugging content filtering.\n"
11276
"-Dforceinvdeltas Force use of inventory deltas during generic streaming "
11278
"-Dgraph Trace graph traversal.\n"
11279
"-Dhashcache Log every time a working file is read to determine its "
11281
"-Dhooks Trace hook execution.\n"
11282
"-Dhpss Trace smart protocol requests and responses.\n"
11283
"-Dhpssdetail More hpss details.\n"
11284
"-Dhpssvfs Traceback on vfs access to Remote objects.\n"
11285
"-Dhttp Trace http connections, requests and responses.\n"
11286
"-Dindex Trace major index operations.\n"
11287
"-Dknit Trace knit operations.\n"
11288
"-Dlock Trace when lockdir locks are taken or released.\n"
11289
"-Dnoretry If a connection is reset, fail immediately rather than\n"
11290
" retrying the request.\n"
11291
"-Dprogress Trace progress bar operations.\n"
11292
"-Dmem_dump Dump memory to a file upon an out of memory error.\n"
11293
"-Dmerge Emit information for debugging merges.\n"
11294
"-Dno_apport Don't use apport to report crashes.\n"
11295
"-Dno_activity \t Don't show transport activity indicator in progress bar.\n"
11296
"-Dpack Emit information about pack operations.\n"
11297
"-Drelock Emit a message every time a branch or repository object "
11299
" unlocked then relocked the same way.\n"
11300
"-Dsftp Trace SFTP internals.\n"
11301
"-Dstatic_tuple Error when a tuple is used where a StaticTuple is "
11303
"-Dstream Trace fetch streams.\n"
11304
"-Dstrict_locks Trace when OS locks are potentially used in a non-"
11307
"-Dunlock Some errors during unlock are treated as warnings.\n"
11308
"-DIDS_never Never use InterDifferingSerializer when fetching.\n"
11309
"-DIDS_always Always use InterDifferingSerializer to fetch if "
11311
" for the format, even for non-local fetches.\n"
11314
#: en/help_topics/diverged-branches.txt:1
11316
"Diverged Branches\n"
11317
"================="
11320
#: en/help_topics/diverged-branches.txt:4
11322
"When Bazaar tries to push one branch onto another, it requires that the\n"
11323
"destination branch must be ready to receive the source branch. If this "
11325
"the case, then we say that the branches have ``diverged``. Branches are\n"
11326
"considered diverged if the destination branch's most recent commit is one "
11328
"has not been merged (directly or indirectly) by the source branch. To "
11330
"from diverged branches, one must merge the missing revisions into the "
11335
#: en/help_topics/diverged-branches.txt:12
11337
"This situation commonly arises when using a centralized workflow with local\n"
11338
"commits. If someone else has committed new work to the mainline since your\n"
11339
"last pull and you have local commits that have not yet been pushed to the\n"
11340
"mainline, then your local branch and the mainline have diverged."
11343
#: en/help_topics/diverged-branches.txt:17
11345
"Discovering What Has Diverged\n"
11346
"-----------------------------"
11349
#: en/help_topics/diverged-branches.txt:20
11351
"The ``bzr missing`` command is used to find out what revisions are in "
11353
"branch that are not present in the current branch, and vice-versa. It shows "
11355
"summary of which extra revisions exist in each branch. If you want to see "
11357
"precise effects of those revisions, you can use ``bzr diff --"
11358
"old=other_branch``\n"
11359
"to show the differences between other_branch and your current branch."
11362
#: en/help_topics/diverged-branches.txt:26
11368
#: en/help_topics/diverged-branches.txt:29
11370
"The solution is to merge the revisions from the mainline into your local\n"
11371
"branch. To do so, use ``bzr merge`` to get the new revisions from the\n"
11372
"mainline. This merge may result in conflicts if the other developer's "
11374
"overlap with your changes. These conflicts should be resolved before\n"
11375
"continuing. After any conflicts have been resolved, or even if there were "
11377
"conflicts, Bazaar requires that you explicitly commit these new revisions\n"
11378
"to your local branch. This requirement gives you an opportunity to test "
11380
"resulting working tree for correctness, since the merged revisions could "
11382
"made arbitrary changes. After testing, you should commit the merge using\n"
11383
"``bzr commit``. This clears up the diverged branches situation. Your "
11385
"branch can now be pushed to the mainline.\n"
11388
#: en/help_topics/eol.txt:1
11390
"End of Line Conversion\n"
11391
"======================"
11394
#: en/help_topics/eol.txt:4
11396
"EOL conversion is provided as a content filter where Bazaar internally\n"
11397
"stores a canonical format but outputs a convenience format. See\n"
11398
"``bzr help content-filters`` for general information about using these."
11401
#: en/help_topics/eol.txt:8
11403
"Note: Content filtering is only supported in recently added formats,\n"
11404
"e.g. 1.14. Be sure that both the repository *and* the branch are\n"
11405
"in a recent format. (Just setting the format on the repository\n"
11406
"is not enough.) If content filtering does not appear to be working, use\n"
11407
"'bzr info -v' to confirm that the branch is using \"Working tree format 5\"\n"
11411
#: en/help_topics/eol.txt:15
11413
"EOL conversion needs to be enabled for selected file patterns using\n"
11414
"rules. See ``bzr help rules`` for general information on defining rules.\n"
11415
"Currently, rules are only supported in $BZR_HOME/.bazaar/rules (or\n"
11416
"%BZR_HOME%/bazaar/2.0/rules on Windows). Branch specific rules will be\n"
11417
"supported in a future verison of Bazaar."
11420
#: en/help_topics/eol.txt:21
11422
"To configure which files to filter, set ``eol`` to one of the values below.\n"
11423
"(If a value is not set, ``exact`` is the default.)"
11426
#: en/help_topics/eol.txt:24
11428
" ========== ===================================== ======================\n"
11429
" Value Checkout end-of-lines as Commit end-of-lines as\n"
11430
" ========== ===================================== ======================\n"
11431
" ``native`` ``crlf`` on Windows, ``lf`` otherwise ``lf``\n"
11432
" ---------- ------------------------------------- ----------------------\n"
11433
" ``lf`` ``lf`` ``lf``\n"
11434
" ---------- ------------------------------------- ----------------------\n"
11435
" ``crlf`` ``crlf`` ``lf``\n"
11436
" ---------- ------------------------------------- ----------------------\n"
11437
" ``exact`` No conversion Exactly as in file\n"
11438
" ========== ===================================== ======================"
11441
#: en/help_topics/eol.txt:36
11443
"Note: For safety reasons, no conversion is applied to any file where a null\n"
11444
"byte is detected in the file."
11447
#: en/help_topics/eol.txt:39
11449
"For users working on a cross-platform project, here is a suggested rule\n"
11450
"to use as a starting point::"
11453
#: en/help_topics/eol.txt:42 en/help_topics/eol.txt:52
11454
#: en/help_topics/eol.txt:67 en/help_topics/eol.txt:82
11460
#: en/help_topics/eol.txt:45
11462
"If you have binary files that do not contain a null byte though, be\n"
11463
"sure to add ``eol = exact`` rules for those as well. You can do this\n"
11464
"by giving more explicit patterns earlier in the rules file. For example::"
11467
#: en/help_topics/eol.txt:49
11473
#: en/help_topics/eol.txt:55
11475
"If your working tree is on a network drive shared by users on different\n"
11476
"operating systems, you typically want to force certain conventions for\n"
11477
"certain files. In that way, if a file is created with the wrong line\n"
11478
"endings or line endings get mixed during editing, it gets committed\n"
11479
"correctly and gets checked out correctly. For example::"
11482
#: en/help_topics/eol.txt:61
11488
#: en/help_topics/eol.txt:64
11494
#: en/help_topics/eol.txt:70
11496
"If you take the care to create files with their required endings, you can\n"
11497
"achieve *almost* the same thing by using ``eol = exact``. It is slightly\n"
11498
"safer to use ``lf`` and ``crlf`` though because edits accidentally\n"
11499
"introducing mixed line endings will be corrected during commit for files\n"
11500
"with those settings."
11503
#: en/help_topics/eol.txt:76
11505
"If you have sample test data that deliberately has text files with mixed\n"
11506
"newline conventions, you can ask for those to be left alone like this::"
11509
#: en/help_topics/eol.txt:79
11511
" [name test_data/]\n"
11515
#: en/help_topics/eol.txt:85
11517
"Note that ``exact`` does not imply the file is binary but it does mean\n"
11518
"that no conversion of end-of-lines will be done. (Bazaar currently relies\n"
11519
"of content analysis to detect binary files for commands like ``diff``.\n"
11520
"In the future, a ``binary = true`` rule may be added but it is not\n"
11524
#: en/help_topics/eol.txt:91
11526
"If you have an existing repository with text files already stored using\n"
11527
"Windows newline conventions (``crlf``), then you may want to keep using "
11529
"convention in the repository. Forcing certain files to this convention\n"
11530
"may also help users who do not have rules configured. To do this, set\n"
11531
"``eol`` to one of the values below."
11534
#: en/help_topics/eol.txt:97
11536
" ============================ ======================== "
11537
"======================\n"
11538
" Value Checkout end-of-lines as Commit end-of-lines "
11540
" ============================ ======================== "
11541
"======================\n"
11542
" ``native-with-crlf-in-repo`` ``crlf`` on Windows, ``crlf``\n"
11543
" ``lf`` otherwise\n"
11544
" ---------------------------- ------------------------ ----------------------"
11546
" ``lf-with-crlf-in-repo`` ``lf`` ``crlf``\n"
11547
" ---------------------------- ------------------------ ----------------------"
11549
" ``crlf-with-crlf-in-repo`` ``crlf`` ``crlf``\n"
11550
" ============================ ======================== ======================"
11553
#: en/help_topics/eol.txt:108
11555
"For users working on an existing project that uses Windows newline\n"
11556
"conventions in their Bazaar repository, this rule is suggested as a\n"
11560
#: en/help_topics/eol.txt:112
11563
" eol = native-with-crlf-in-repo"
11566
#: en/help_topics/eol.txt:115
11568
"For new projects, it is recommended that end-of-lines be stored as ``lf``\n"
11569
"and that users stick to the basic settings, i.e. ``native``, ``lf``,\n"
11570
"``crlf`` and ``exact``."
11573
#: en/help_topics/eol.txt:119
11575
"Note: Bazaar's EOL conversion will convert the content of files but\n"
11576
"never reject files because a given line ending or mixed line endings\n"
11577
"are found. A precommit hook should be used if you wish to validate\n"
11578
"(and not just convert) content before committing.\n"
11581
#: en/help_topics/hidden-commands.txt:1
11583
"added List files added in working tree.\n"
11584
"ancestry List all revisions merged into this branch.\n"
11585
"assert-fail Test reporting of assertion failures\n"
11586
"bundle-info Output interesting stats about a bundle\n"
11587
"bundle-revisions Create a merge-directive for submitting changes.\n"
11588
"cat-revision Write out metadata for a revision.\n"
11589
"dump-btree Dump the contents of a btree index file to stdout.\n"
11590
"export-pot Export command helps and error messages in po format.\n"
11591
"file-id Print file_id of a particular file or directory.\n"
11592
"file-path Print path of file_ids to a file or directory.\n"
11593
"find-merge-base Find and print a base revision for merging two "
11595
"hooks Show hooks.\n"
11596
"inventory Show inventory of the current working copy or a "
11598
"local-time-offset Show the offset in seconds from GMT to local time.\n"
11599
"lookup-revision Lookup the revision-id from a revision-number\n"
11600
"merge-directive Generate a merge directive for auto-merge tools.\n"
11601
"modified List files modified in working tree.\n"
11602
"re-sign Create a digital signature for an existing revision.\n"
11603
"reference list, view and set branch locations for nested trees.\n"
11604
"relpath Show path of a file relative to root\n"
11605
"repair-workingtree Reset the working tree state file.\n"
11606
"revision-history Display the list of revision ids on a branch.\n"
11607
"revision-info Show revision number and revision id for a given "
11610
"rocks Statement of optimism.\n"
11611
"selftest Run internal test suite.\n"
11612
"shell-complete Show appropriate completions for context.\n"
11613
"test-script Run a shell-like test from a file.\n"
11614
"touching-revisions Return revision-ids which affected a particular file.\n"
11615
"unknowns List unknown files.\n"
11616
"wait-until-signalled Test helper for\n"
11617
" test_start_and_stop_bzr_subprocess_send_signal.\n"
11620
#: en/help_topics/hooks.txt:1
11627
#: en/help_topics/hooks.txt:5 en/help_topics/rules.txt:4
11633
#: en/help_topics/hooks.txt:8
11634
msgid "A hook of type *xxx* of class *yyy* needs to be registered using::"
11637
#: en/help_topics/hooks.txt:10
11638
msgid " yyy.hooks.install_named_hook(\"xxx\", ...)"
11641
#: en/help_topics/hooks.txt:12
11643
"See :doc:`Using hooks<../user-guide/hooks>` in the User Guide for examples."
11646
#: en/help_topics/hooks.txt:14
11648
"The class that contains each hook is given before the hooks it supplies. "
11650
"instance, BranchHooks as the class is the hooks class for\n"
11651
"`bzrlib.branch.Branch.hooks`."
11654
#: en/help_topics/hooks.txt:18
11656
"Each description also indicates whether the hook runs on the client (the\n"
11657
"machine where bzr was invoked) or the server (the machine addressed by\n"
11658
"the branch URL). These may be, but are not necessarily, the same machine."
11661
#: en/help_topics/hooks.txt:22
11663
"Plugins (including hooks) are run on the server if all of these is true:"
11666
#: en/help_topics/hooks.txt:24
11668
" * The connection is via a smart server (accessed with a URL starting with\n"
11669
" \"bzr://\", \"bzr+ssh://\" or \"bzr+http://\", or accessed via a "
11671
" URL when a smart server is available via HTTP)."
11674
#: en/help_topics/hooks.txt:28
11676
" * The hook is either server specific or part of general infrastructure "
11678
" than client specific code (such as commit)."
11681
#: en/help_topics/hooks.txt:31
11688
#: en/help_topics/hooks.txt:35
11690
"automatic_tag_name\n"
11691
"~~~~~~~~~~~~~~~~~~"
11694
#: en/help_topics/hooks.txt:38 en/help_topics/hooks.txt:56
11695
#: en/help_topics/hooks.txt:102 en/help_topics/hooks.txt:262
11696
msgid "Introduced in: 2.2"
11699
#: en/help_topics/hooks.txt:40
11701
"Called to determine an automatic tag name for a revision.\n"
11702
"automatic_tag_name is called with (branch, revision_id) and should\n"
11703
"return a tag name or None if no tag name could be determined. The\n"
11704
"first non-None tag name returned will be used."
11707
#: en/help_topics/hooks.txt:45
11713
#: en/help_topics/hooks.txt:48 en/help_topics/hooks.txt:293
11714
#: en/help_topics/hooks.txt:307
11715
msgid "Introduced in: 1.8"
11718
#: en/help_topics/hooks.txt:50
11720
"Called with the Branch object that has been opened after a branch is\n"
11724
#: en/help_topics/hooks.txt:53
11726
"post_branch_init\n"
11730
#: en/help_topics/hooks.txt:58
11732
"Called after new branch initialization completes. post_branch_init is\n"
11733
"called with a bzrlib.branch.BranchInitHookParams. Note that init,\n"
11734
"branch and checkout (both heavyweight and lightweight) will all\n"
11735
"trigger this hook."
11738
#: en/help_topics/hooks.txt:63
11740
"post_change_branch_tip\n"
11741
"~~~~~~~~~~~~~~~~~~~~~~"
11744
#: en/help_topics/hooks.txt:66 en/help_topics/hooks.txt:421
11745
msgid "Introduced in: 1.4"
11748
#: en/help_topics/hooks.txt:68
11750
"Called in bzr client and server after a change to the tip of a branch\n"
11751
"is made. post_change_branch_tip is called with a\n"
11752
"bzrlib.branch.ChangeBranchTipParams. Note that push, pull, commit,\n"
11753
"uncommit will all trigger this hook."
11756
#: en/help_topics/hooks.txt:73 en/help_topics/hooks.txt:392
11762
#: en/help_topics/hooks.txt:76 en/help_topics/hooks.txt:86
11763
#: en/help_topics/hooks.txt:94 en/help_topics/hooks.txt:110
11764
msgid "Introduced in: 0.15"
11767
#: en/help_topics/hooks.txt:78
11769
"Called in the bzr client after a commit has completed. post_commit is\n"
11770
"called with (local, master, old_revno, old_revid, new_revno,\n"
11771
"new_revid). old_revid is NULL_REVISION for the first commit to a\n"
11775
#: en/help_topics/hooks.txt:83
11781
#: en/help_topics/hooks.txt:88
11783
"Called after a pull operation completes. post_pull is called with a\n"
11784
"bzrlib.branch.PullResult object and only runs in the bzr client."
11787
#: en/help_topics/hooks.txt:91
11793
#: en/help_topics/hooks.txt:96
11795
"Called after a push operation completes. post_push is called with a\n"
11796
"bzrlib.branch.BranchPushResult object and only runs in the bzr client."
11799
#: en/help_topics/hooks.txt:99
11805
#: en/help_topics/hooks.txt:104
11807
"Called after a checkout switches branch. post_switch is called with a\n"
11808
"bzrlib.branch.SwitchHookParams."
11811
#: en/help_topics/hooks.txt:107
11817
#: en/help_topics/hooks.txt:112
11819
"Called in the bzr client after an uncommit completes. post_uncommit is\n"
11820
"called with (local, master, old_revno, old_revid, new_revno,\n"
11821
"new_revid) where local is the local branch or None, master is the\n"
11822
"target branch, and an empty branch receives new_revno of 0, new_revid\n"
11826
#: en/help_topics/hooks.txt:118
11828
"pre_change_branch_tip\n"
11829
"~~~~~~~~~~~~~~~~~~~~~"
11832
#: en/help_topics/hooks.txt:121
11833
msgid "Introduced in: 1.6"
11836
#: en/help_topics/hooks.txt:123
11838
"Called in bzr client and server before a change to the tip of a branch\n"
11839
"is made. pre_change_branch_tip is called with a\n"
11840
"bzrlib.branch.ChangeBranchTipParams. Note that push, pull, commit,\n"
11841
"uncommit will all trigger this hook."
11844
#: en/help_topics/hooks.txt:128
11850
#: en/help_topics/hooks.txt:131
11851
msgid "Introduced in: 0.91"
11854
#: en/help_topics/hooks.txt:133
11856
"Called after a commit is calculated but before it is completed.\n"
11857
"pre_commit is called with (local, master, old_revno, old_revid,\n"
11858
"future_revno, future_revid, tree_delta, future_tree). old_revid is\n"
11859
"NULL_REVISION for the first commit to a branch, tree_delta is a\n"
11860
"TreeDelta object describing changes from the basis revision. hooks\n"
11861
"MUST NOT modify this delta. future_tree is an in-memory tree obtained\n"
11862
"from CommitBuilder.revision_tree() and hooks MUST NOT modify this\n"
11866
#: en/help_topics/hooks.txt:142
11868
"transform_fallback_location\n"
11869
"~~~~~~~~~~~~~~~~~~~~~~~~~~~"
11872
#: en/help_topics/hooks.txt:145
11873
msgid "Introduced in: 1.9"
11876
#: en/help_topics/hooks.txt:147
11878
"Called when a stacked branch is activating its fallback locations.\n"
11879
"transform_fallback_location is called with (branch, url), and should\n"
11880
"return a new url. Returning the same url allows it to be used as-is,\n"
11881
"returning a different one can be used to cause the branch to stack on\n"
11882
"a closer copy of that fallback_location. Note that the branch cannot\n"
11883
"have history accessing methods called on it during this hook because\n"
11884
"the fallback locations have not been activated. When there are\n"
11885
"multiple hooks installed for transform_fallback_location, all are\n"
11886
"called with the url returned from the previous hook.The order is\n"
11887
"however undefined."
11890
#: en/help_topics/hooks.txt:158
11896
#: en/help_topics/hooks.txt:161
11902
#: en/help_topics/hooks.txt:164
11903
msgid "Introduced in: 1.13"
11906
#: en/help_topics/hooks.txt:166
11908
"Called after creating a command object to allow modifications such as\n"
11909
"adding or removing options, docs etc. Called with the new\n"
11910
"bzrlib.commands.Command object."
11913
#: en/help_topics/hooks.txt:170
11919
#: en/help_topics/hooks.txt:173 en/help_topics/hooks.txt:185
11920
#: en/help_topics/hooks.txt:194 en/help_topics/hooks.txt:467
11921
msgid "Introduced in: 1.17"
11924
#: en/help_topics/hooks.txt:175
11926
"Called when creating a single command. Called with (cmd_or_None,\n"
11927
"command_name). get_command should either return the cmd_or_None\n"
11928
"parameter, or a replacement Command object that should be used for the\n"
11929
"command. Note that the Command.hooks hooks are core infrastructure.\n"
11930
"Many users will prefer to use bzrlib.commands.register_command or\n"
11931
"plugin_cmds.register_lazy."
11934
#: en/help_topics/hooks.txt:182
11936
"get_missing_command\n"
11937
"~~~~~~~~~~~~~~~~~~~"
11940
#: en/help_topics/hooks.txt:187
11942
"Called when creating a single command if no command could be found.\n"
11943
"Called with (command_name). get_missing_command should either return\n"
11944
"None, or a Command object to be used for the command."
11947
#: en/help_topics/hooks.txt:191
11953
#: en/help_topics/hooks.txt:196
11955
"Called when enumerating commands. Called with a set of cmd_name\n"
11956
"strings for all the commands found so far. This set is safe to mutate\n"
11957
"- e.g. to remove a command. list_commands should return the updated\n"
11958
"set of command names."
11961
#: en/help_topics/hooks.txt:201
11967
#: en/help_topics/hooks.txt:204 en/help_topics/hooks.txt:211
11968
msgid "Introduced in: 2.6"
11971
#: en/help_topics/hooks.txt:206
11972
msgid "Called after executing a command. Called with the command object."
11975
#: en/help_topics/hooks.txt:208
11981
#: en/help_topics/hooks.txt:213
11982
msgid "Called prior to executing a command. Called with the command object."
11985
#: en/help_topics/hooks.txt:215
11991
#: en/help_topics/hooks.txt:218
11997
#: en/help_topics/hooks.txt:221 en/help_topics/hooks.txt:229
11998
#: en/help_topics/hooks.txt:236 en/help_topics/hooks.txt:244
11999
#: en/help_topics/hooks.txt:251 en/help_topics/hooks.txt:373
12000
#: en/help_topics/hooks.txt:446
12001
msgid "Introduced in: 2.4"
12004
#: en/help_topics/hooks.txt:223
12006
"Invoked when a config option is read. The signature is (stack, name,\n"
12010
#: en/help_topics/hooks.txt:226
12016
#: en/help_topics/hooks.txt:231
12017
msgid "Invoked when a config store is loaded. The signature is (store)."
12020
#: en/help_topics/hooks.txt:233
12026
#: en/help_topics/hooks.txt:238
12028
"Invoked when a config option is removed. The signature is (stack,\n"
12032
#: en/help_topics/hooks.txt:241
12038
#: en/help_topics/hooks.txt:246
12039
msgid "Invoked when a config store is saved. The signature is (store)."
12042
#: en/help_topics/hooks.txt:248
12048
#: en/help_topics/hooks.txt:253
12050
"Invoked when a config option is set. The signature is (stack, name,\n"
12054
#: en/help_topics/hooks.txt:256
12056
"ControlDirHooks\n"
12060
#: en/help_topics/hooks.txt:259
12066
#: en/help_topics/hooks.txt:264
12068
"Invoked after a repository has been initialized. post_repo_init is\n"
12069
"called with a bzrlib.controldir.RepoInitHookParams."
12072
#: en/help_topics/hooks.txt:267
12078
#: en/help_topics/hooks.txt:270
12079
msgid "Introduced in: 1.14"
12082
#: en/help_topics/hooks.txt:272
12084
"Invoked before attempting to open a ControlDir with the transport that\n"
12085
"the open will use."
12088
#: en/help_topics/hooks.txt:275
12094
#: en/help_topics/hooks.txt:278
12100
#: en/help_topics/hooks.txt:281 en/help_topics/hooks.txt:300
12101
#: en/help_topics/hooks.txt:524
12102
msgid "Introduced in: 1.15"
12105
#: en/help_topics/hooks.txt:283
12107
"Invoked when displaying the statistics for a repository. repository is\n"
12108
"called with a statistics dictionary as returned by the repository and\n"
12109
"a file-like object to write to."
12112
#: en/help_topics/hooks.txt:287
12118
#: en/help_topics/hooks.txt:290
12124
#: en/help_topics/hooks.txt:295
12126
"Called with a bzrlib.lock.LockResult when a physical lock is acquired."
12129
#: en/help_topics/hooks.txt:297
12135
#: en/help_topics/hooks.txt:302
12136
msgid "Called with a bzrlib.lock.LockResult when a physical lock is broken."
12139
#: en/help_topics/hooks.txt:304
12145
#: en/help_topics/hooks.txt:309
12147
"Called with a bzrlib.lock.LockResult when a physical lock is released."
12150
#: en/help_topics/hooks.txt:311
12156
#: en/help_topics/hooks.txt:314
12158
"merge_file_content\n"
12159
"~~~~~~~~~~~~~~~~~~"
12162
#: en/help_topics/hooks.txt:317
12163
msgid "Introduced in: 2.1"
12166
#: en/help_topics/hooks.txt:319
12168
"Called with a bzrlib.merge.Merger object to create a per file merge\n"
12169
"object when starting a merge. Should return either None or a subclass\n"
12170
"of ``bzrlib.merge.AbstractPerFileMerger``. Such objects will then be\n"
12171
"called per file that needs to be merged (including when one side has\n"
12172
"deleted the file and the other has changed it). See the\n"
12173
"AbstractPerFileMerger API docs for details on how it is used by merge."
12176
#: en/help_topics/hooks.txt:326
12182
#: en/help_topics/hooks.txt:329 en/help_topics/hooks.txt:337
12183
#: en/help_topics/hooks.txt:387 en/help_topics/hooks.txt:405
12184
#: en/help_topics/hooks.txt:413 en/help_topics/hooks.txt:512
12185
msgid "Introduced in: 2.5"
12188
#: en/help_topics/hooks.txt:331
12190
"Called after a merge. Receives a Merger object as the single argument.\n"
12191
"The return value is ignored."
12194
#: en/help_topics/hooks.txt:334
12200
#: en/help_topics/hooks.txt:339
12202
"Called before a merge. Receives a Merger object as the single\n"
12206
#: en/help_topics/hooks.txt:342
12208
"MergeDirectiveHooks\n"
12209
"-------------------"
12212
#: en/help_topics/hooks.txt:345
12214
"merge_request_body\n"
12215
"~~~~~~~~~~~~~~~~~~"
12218
#: en/help_topics/hooks.txt:348
12219
msgid "Introduced in: 1.15.0"
12222
#: en/help_topics/hooks.txt:350
12224
"Called with a MergeRequestBodyParams when a body is needed for a merge\n"
12225
"request. Callbacks must return a body. If more than one callback is\n"
12226
"registered, the output of one callback is provided to the next."
12229
#: en/help_topics/hooks.txt:354
12231
"MessageEditorHooks\n"
12232
"------------------"
12235
#: en/help_topics/hooks.txt:357
12237
"commit_message_template\n"
12238
"~~~~~~~~~~~~~~~~~~~~~~~"
12241
#: en/help_topics/hooks.txt:360
12242
msgid "Introduced in: 1.10"
12245
#: en/help_topics/hooks.txt:362
12247
"Called when a commit message is being generated.\n"
12248
"commit_message_template is called with the bzrlib.commit.Commit object\n"
12249
"and the message that is known so far. commit_message_template must\n"
12250
"return a new message to use (which could be the same as it was given).\n"
12251
"When there are multiple hooks registered for commit_message_template,\n"
12252
"they are chained with the result from the first passed into the\n"
12253
"second, and so on."
12256
#: en/help_topics/hooks.txt:370
12258
"set_commit_message\n"
12259
"~~~~~~~~~~~~~~~~~~"
12262
#: en/help_topics/hooks.txt:375
12264
"Set a fixed commit message. set_commit_message is called with the\n"
12265
"bzrlib.commit.Commit object (so you can also change e.g. revision\n"
12266
"properties by editing commit.builder._revprops) and the message so\n"
12267
"far. set_commit_message must return the message to use or None if it\n"
12268
"should use the message editor as normal."
12271
#: en/help_topics/hooks.txt:381
12273
"MutableTreeHooks\n"
12277
#: en/help_topics/hooks.txt:384
12279
"post_build_tree\n"
12283
#: en/help_topics/hooks.txt:389
12285
"Called after a completely new tree is built. The hook is called with\n"
12286
"the tree as its only argument."
12289
#: en/help_topics/hooks.txt:395
12290
msgid "Introduced in: 2.0"
12293
#: en/help_topics/hooks.txt:397
12295
"Called after a commit is performed on a tree. The hook is called with\n"
12296
"a bzrlib.mutabletree.PostCommitHookParams object. The mutable tree the\n"
12297
"commit was performed on is available via the mutable_tree attribute of\n"
12301
#: en/help_topics/hooks.txt:402
12307
#: en/help_topics/hooks.txt:407
12309
"Called after a tree transform has been performed on a tree. The hook\n"
12310
"is called with the tree that is being transformed and the transform."
12313
#: en/help_topics/hooks.txt:410
12319
#: en/help_topics/hooks.txt:415
12321
"Called before a tree transform on this tree. The hook is called with\n"
12322
"the tree that is being transformed and the transform."
12325
#: en/help_topics/hooks.txt:418
12331
#: en/help_topics/hooks.txt:423
12333
"Called before a commit is performed on a tree. The start commit hook\n"
12334
"is able to change the tree before the commit takes place. start_commit\n"
12335
"is called with the bzrlib.mutabletree.MutableTree that the commit is\n"
12336
"being performed on."
12339
#: en/help_topics/hooks.txt:428
12341
"SmartClientHooks\n"
12345
#: en/help_topics/hooks.txt:431
12351
#: en/help_topics/hooks.txt:434
12352
msgid "Introduced in: unknown"
12355
#: en/help_topics/hooks.txt:436
12357
"Called when the smart client is submitting a request to the smart\n"
12358
"server. Called with a bzrlib.smart.client.CallHookParams object.\n"
12359
"Streaming request bodies, and responses, are not accessible."
12362
#: en/help_topics/hooks.txt:440
12364
"SmartServerHooks\n"
12368
#: en/help_topics/hooks.txt:443
12370
"server_exception\n"
12374
#: en/help_topics/hooks.txt:448
12376
"Called by the bzr server when an exception occurs. server_exception is\n"
12377
"called with the sys.exc_info() tuple return true for the hook if the\n"
12378
"exception has been handled, in which case the server will exit\n"
12382
#: en/help_topics/hooks.txt:453
12388
#: en/help_topics/hooks.txt:456 en/help_topics/hooks.txt:475
12389
msgid "Introduced in: 0.16"
12392
#: en/help_topics/hooks.txt:458
12394
"Called by the bzr server when it starts serving a directory.\n"
12395
"server_started is called with (backing urls, public url), where\n"
12396
"backing_url is a list of URLs giving the server-specific directory\n"
12397
"locations, and public_url is the public URL for the directory being\n"
12401
#: en/help_topics/hooks.txt:464
12403
"server_started_ex\n"
12404
"~~~~~~~~~~~~~~~~~"
12407
#: en/help_topics/hooks.txt:469
12409
"Called by the bzr server when it starts serving a directory.\n"
12410
"server_started is called with (backing_urls, server_obj)."
12413
#: en/help_topics/hooks.txt:472
12419
#: en/help_topics/hooks.txt:477
12421
"Called by the bzr server when it stops serving a directory.\n"
12422
"server_stopped is called with the same parameters as the\n"
12423
"server_started hook: (backing_urls, public_url)."
12426
#: en/help_topics/hooks.txt:481
12432
#: en/help_topics/hooks.txt:484
12438
#: en/help_topics/hooks.txt:487 en/help_topics/hooks.txt:498
12439
msgid "Introduced in: 2.3"
12442
#: en/help_topics/hooks.txt:489
12444
"Called with argument StatusHookParams after Bazaar has displayed the\n"
12445
"status. StatusHookParams has the attributes (old_tree, new_tree,\n"
12446
"to_file, versioned, show_ids, short, verbose). The last four arguments\n"
12447
"correspond to the command line options specified by the user for the\n"
12448
"status command. to_file is the output stream for writing."
12451
#: en/help_topics/hooks.txt:495
12457
#: en/help_topics/hooks.txt:500
12459
"Called with argument StatusHookParams before Bazaar displays the\n"
12460
"status. StatusHookParams has the attributes (old_tree, new_tree,\n"
12461
"to_file, versioned, show_ids, short, verbose). The last four arguments\n"
12462
"correspond to the command line options specified by the user for the\n"
12463
"status command. to_file is the output stream for writing."
12466
#: en/help_topics/hooks.txt:506
12472
#: en/help_topics/hooks.txt:509
12478
#: en/help_topics/hooks.txt:514
12480
"Called after a new connection is established or a reconnect occurs.\n"
12481
"The sole argument passed is either the connected transport or smart\n"
12485
#: en/help_topics/hooks.txt:518
12487
"RioVersionInfoBuilderHooks\n"
12488
"--------------------------"
12491
#: en/help_topics/hooks.txt:521
12497
#: en/help_topics/hooks.txt:526
12499
"Invoked when adding information about a revision to the RIO stanza\n"
12500
"that is printed. revision is called with a revision object and a RIO\n"
12504
#: en/help_topics/location-alias.txt:1
12506
"Location aliases\n"
12510
#: en/help_topics/location-alias.txt:4
12512
"Bazaar defines several aliases for locations associated with a branch. "
12514
"can be used with most commands that expect a location, such as `bzr push`."
12517
#: en/help_topics/location-alias.txt:7
12518
msgid "The aliases are::"
12521
#: en/help_topics/location-alias.txt:9
12523
" :bound The branch this branch is bound to, for bound branches.\n"
12524
" :parent The parent of this branch.\n"
12525
" :public The public location of this branch.\n"
12526
" :push The saved location used for `bzr push` with no arguments.\n"
12527
" :submit The submit branch for this branch.\n"
12528
" :this This branch."
12531
#: en/help_topics/location-alias.txt:16
12532
msgid "For example, to push to the parent location::"
12535
#: en/help_topics/location-alias.txt:18
12536
msgid " bzr push :parent\n"
12539
#: en/help_topics/log-formats.txt:1
12545
#: en/help_topics/log-formats.txt:4
12547
"A log format controls how information about each revision is displayed.\n"
12548
"The standard log formats are compared below::"
12551
#: en/help_topics/log-formats.txt:7
12553
" Feature long short line\n"
12554
" ---------------------- ------------- ------------ -------------------\n"
12555
" design goal detailed view concise view 1 revision per line\n"
12556
" committer name+email name only name only\n"
12557
" author name+email - -\n"
12558
" date-time format full date only date only\n"
12559
" commit message full full top line\n"
12560
" tags yes yes yes\n"
12561
" merges indicator - yes -\n"
12562
" status/delta optional optional -\n"
12563
" diff/patch optional optional -\n"
12564
" revision-id optional optional -\n"
12565
" branch nick yes - -\n"
12566
" foreign vcs properties yes yes -\n"
12567
" preferred levels all 1 1\n"
12568
" digital signature optional - -"
12571
#: en/help_topics/log-formats.txt:24
12573
"The default format is ``long``. To change this, define the ``log_format``\n"
12574
"setting in the ``[DEFAULT]`` section of ``bazaar.conf`` like this (say)::"
12577
#: en/help_topics/log-formats.txt:27
12580
" log_format = short"
12583
#: en/help_topics/log-formats.txt:30
12585
"Alternatively, to change the log format used for a given query, use the\n"
12586
"--long, --short or --line options."
12589
#: en/help_topics/log-formats.txt:33
12591
"If one of the standard log formats does not meet your needs, additional\n"
12592
"formats can be provided by plugins.\n"
12595
#: en/help_topics/other-formats.txt:1
12596
msgid "Other Storage Formats"
12599
#: en/help_topics/other-formats.txt:3
12600
msgid "Experimental formats are shown below."
12603
#: en/help_topics/other-formats.txt:5
12605
":development-colo:\n"
12606
" (native) The 2a format with experimental support for colocated\n"
12610
#: en/help_topics/other-formats.txt:9
12613
"Deprecated formats are shown below."
12616
#: en/help_topics/other-formats.txt:12
12619
" (native) Pack-based format used in 1.x series. Introduced in 0.92.\n"
12620
" Interoperates with bzr repositories before 0.92 but cannot be read\n"
12624
#: en/help_topics/patterns.txt:1
12630
#: en/help_topics/patterns.txt:4
12632
"Bazaar uses patterns to match files at various times. For example,\n"
12633
"the ``add`` command skips over files that match ignore patterns\n"
12634
"and preferences can be associated with files using rule patterns.\n"
12635
"The pattern syntax is described below."
12638
#: en/help_topics/patterns.txt:9
12640
"Trailing slashes on patterns are ignored. If the pattern contains a\n"
12641
"slash or is a regular expression, it is compared to the whole path\n"
12642
"from the branch root. Otherwise, it is compared to only the last\n"
12643
"component of the path. To match a file only in the root directory,\n"
12644
"prepend ``./``. Patterns specifying absolute paths are not allowed."
12647
#: en/help_topics/patterns.txt:15
12648
msgid "Patterns may include globbing wildcards such as::"
12651
#: en/help_topics/patterns.txt:17
12653
" ? - Matches any single character except '/'\n"
12654
" * - Matches 0 or more characters except '/'\n"
12655
" /**/ - Matches 0 or more directories in a path\n"
12656
" [a-z] - Matches a single character from within a group of characters"
12659
#: en/help_topics/patterns.txt:22
12661
"Patterns may also be `Python regular expressions`_. Regular expression\n"
12662
"patterns are identified by a ``RE:`` prefix followed by the regular\n"
12663
"expression. Regular expression patterns may not include named or\n"
12667
#: en/help_topics/patterns.txt:27
12669
"Case insensitive ignore patterns can be specified with regular expressions\n"
12670
"by using the ``i`` (for ignore case) flag in the pattern."
12673
#: en/help_topics/patterns.txt:30
12675
"For example, a case insensitive match for ``foo`` may be specified as::"
12678
#: en/help_topics/patterns.txt:32
12679
msgid " RE:(?i)foo"
12682
#: en/help_topics/patterns.txt:34
12684
"Ignore patterns may be prefixed with ``!``, which means that a filename\n"
12685
"matched by that pattern will not be ignored."
12688
#: en/help_topics/patterns.txt:37
12690
".. _Python regular expressions: http://docs.python.org/library/re.html"
12693
#: en/help_topics/revisionspec.txt:1
12694
msgid "Revision Identifiers"
12697
#: en/help_topics/revisionspec.txt:3
12699
"A revision identifier refers to a specific state of a branch's history. It\n"
12700
"can be expressed in several ways. It can begin with a keyword to\n"
12701
"unambiguously specify a given lookup type; some examples are 'last:1',\n"
12702
"'before:yesterday' and 'submit:'."
12705
#: en/help_topics/revisionspec.txt:8
12707
"Alternately, it can be given without a keyword, in which case it will be\n"
12708
"checked as a revision number, a tag, a revision id, a date specification, or "
12710
"branch specification, in that order. For example, 'date:today' could be\n"
12711
"written as simply 'today', though if you have a tag called 'today' that "
12716
#: en/help_topics/revisionspec.txt:14
12718
"If 'REV1' and 'REV2' are revision identifiers, then 'REV1..REV2' denotes a\n"
12719
"revision range. Examples: '3647..3649', 'date:yesterday..-1' and\n"
12720
"'branch:/path/to/branch1/..branch:/branch2' (note that there are no quotes "
12722
"spaces around the '..')."
12725
#: en/help_topics/revisionspec.txt:19
12727
"Ranges are interpreted differently by different commands. To the \"log\" "
12729
"a range is a sequence of log messages, but to the \"diff\" command, the "
12731
"denotes a change between revisions (and not a sequence of changes). In\n"
12732
"addition, \"log\" considers a closed range whereas \"diff\" and \"merge\" "
12734
"to be open-ended, that is, they include one end but not the other. For "
12736
"\"bzr log -r 3647..3649\" shows the messages of revisions 3647, 3648 and "
12738
"while \"bzr diff -r 3647..3649\" includes the changes done in revisions 3648 "
12740
"3649, but not 3647."
12743
#: en/help_topics/revisionspec.txt:28
12744
msgid "The keywords used as revision selection methods are the following:"
12747
#: en/help_topics/revisionspec.txt:30
12750
"\tSelects a revision using the revision id.\n"
12752
"\tSelects a common ancestor with the submit branch.\n"
12754
"\tSelects a common ancestor with a second branch.\n"
12756
"\tSelects a revision on the basis of a datestamp.\n"
12758
"\tSelects the last revision of a specified branch.\n"
12760
"\tSelects a revision identified by a tag name.\n"
12762
"\tSelects a revision using a number.\n"
12764
"\tSelects the parent of the revision specified.\n"
12766
"\tSelect the revision that last modified the specified line.\n"
12768
"\tSelect mainline revision that merged the specified revision.\n"
12770
"\tSelects the nth revision from the end."
12773
#: en/help_topics/revisionspec.txt:53
12774
msgid "In addition, plugins can provide other keywords."
12777
#: en/help_topics/revisionspec.txt:55
12778
msgid "A detailed description of each keyword is given below."
12781
#: en/help_topics/revisionspec.txt:57
12785
#: en/help_topics/revisionspec.txt:59
12787
" Supply a specific revision id, that can be used to specify any\n"
12788
" revision id in the ancestry of the branch.\n"
12789
" Including merges, and pending merges.\n"
12793
#: en/help_topics/revisionspec.txt:64
12795
" revid:aaaa@bbbb-123456789 -> Select revision 'aaaa@bbbb-123456789'"
12798
#: en/help_topics/revisionspec.txt:66
12802
#: en/help_topics/revisionspec.txt:68
12804
" Diffing against this shows all the changes that were made in this "
12806
" and is a good predictor of what merge will do. The submit branch is\n"
12807
" used by the bundle and merge directive commands. If no submit branch\n"
12808
" is specified, the parent branch is used instead."
12811
#: en/help_topics/revisionspec.txt:73 en/help_topics/revisionspec.txt:85
12813
" The common ancestor is the last revision that existed in both\n"
12814
" branches. Usually this is the branch point, but it could also be\n"
12815
" a revision that was merged."
12818
#: en/help_topics/revisionspec.txt:77 en/help_topics/revisionspec.txt:93
12819
#: en/help_topics/revisionspec.txt:109 en/help_topics/revisionspec.txt:119
12820
#: en/help_topics/revisionspec.txt:153
12821
msgid " Examples::"
12824
#: en/help_topics/revisionspec.txt:79
12825
msgid " $ bzr diff -r submit:"
12828
#: en/help_topics/revisionspec.txt:81
12832
#: en/help_topics/revisionspec.txt:83
12833
msgid " Supply the path to a branch to select the common ancestor."
12836
#: en/help_topics/revisionspec.txt:89
12838
" This is frequently used with 'diff' to return all of the changes\n"
12839
" that your branch introduces, while excluding the changes that you\n"
12840
" have not merged from the remote branch."
12843
#: en/help_topics/revisionspec.txt:95
12845
" ancestor:/path/to/branch\n"
12846
" $ bzr diff -r ancestor:../../mainline/branch"
12849
#: en/help_topics/revisionspec.txt:98
12853
#: en/help_topics/revisionspec.txt:100
12855
" Supply a datestamp to select the first revision that matches the date.\n"
12856
" Date can be 'yesterday', 'today', 'tomorrow' or a YYYY-MM-DD string.\n"
12857
" Matches the first entry after a given date (either at midnight or\n"
12858
" at a specified time)."
12861
#: en/help_topics/revisionspec.txt:105
12862
msgid " One way to display all the changes since yesterday would be::"
12865
#: en/help_topics/revisionspec.txt:107
12866
msgid " bzr log -r date:yesterday.."
12869
#: en/help_topics/revisionspec.txt:111
12871
" date:yesterday -> select the first revision since "
12873
" date:2006-08-14,17:10:14 -> select the first revision after\n"
12874
" August 14th, 2006 at 5:10pm."
12877
#: en/help_topics/revisionspec.txt:115
12881
#: en/help_topics/revisionspec.txt:117
12882
msgid " Supply the path to a branch to select its last revision."
12885
#: en/help_topics/revisionspec.txt:121
12886
msgid " branch:/path/to/branch"
12889
#: en/help_topics/revisionspec.txt:123
12893
#: en/help_topics/revisionspec.txt:125
12894
msgid " Tags are stored in the branch and created by the 'tag' command."
12897
#: en/help_topics/revisionspec.txt:127
12901
#: en/help_topics/revisionspec.txt:129
12903
" Use an integer to specify a revision in the history of the branch.\n"
12904
" Optionally a branch can be specified. A negative number will count\n"
12905
" from the end of the branch (-1 is the last revision, -2 the previous\n"
12906
" one). If the negative number is larger than the branch's history, the\n"
12907
" first revision is returned.\n"
12911
#: en/help_topics/revisionspec.txt:136
12913
" revno:1 -> return the first revision of this branch\n"
12914
" revno:3:/path/to/branch -> return the 3rd revision of\n"
12915
" the branch '/path/to/branch'\n"
12916
" revno:-1 -> The last revision in a branch.\n"
12917
" -2:http://other/branch -> The second to last revision in the\n"
12918
" remote branch.\n"
12919
" -1000000 -> Most likely the first revision, unless\n"
12920
" your history is very long."
12923
#: en/help_topics/revisionspec.txt:145
12927
#: en/help_topics/revisionspec.txt:147
12929
" Supply any revision spec to return the parent of that revision. This "
12931
" mostly useful when inspecting revisions that are not in the revision "
12936
#: en/help_topics/revisionspec.txt:151
12938
" It is an error to request the parent of the null revision (before:0)."
12941
#: en/help_topics/revisionspec.txt:155
12943
" before:1913 -> Return the parent of revno 1913 (revno 1912)\n"
12944
" before:revid:aaaa@bbbb-1234567890 -> return the parent of revision\n"
12945
" aaaa@bbbb-1234567890\n"
12946
" bzr diff -r before:1913..1913\n"
12947
" -> Find the changes between revision 1913 and its parent "
12949
" (What changes did revision 1913 introduce).\n"
12950
" This is equivalent to: bzr diff -c 1913"
12953
#: en/help_topics/revisionspec.txt:163
12957
#: en/help_topics/revisionspec.txt:165
12959
" Select the revision that last modified the specified line. Line is\n"
12960
" specified as path:number. Path is a relative path to the file. "
12962
" start at 1, and are relative to the current version, not the last-\n"
12963
" committed version of the file."
12966
#: en/help_topics/revisionspec.txt:170
12970
#: en/help_topics/revisionspec.txt:172
12972
" Select the revision that merged the specified revision into mainline."
12975
#: en/help_topics/revisionspec.txt:174
12979
#: en/help_topics/revisionspec.txt:176
12981
" Supply a positive number to get the nth revision from the end.\n"
12982
" This is the same as supplying negative numbers to the 'revno:' spec.\n"
12986
#: en/help_topics/revisionspec.txt:180
12988
" last:1 -> return the last revision\n"
12989
" last:3 -> return the revision 2 before the end.\n"
12992
#: en/help_topics/rules.txt:1
12998
#: en/help_topics/rules.txt:7
13000
"Rules are defined in ini file format where the sections are file glob\n"
13001
"patterns and the contents of each section are the preferences for files\n"
13002
"matching that pattern(s). For example::"
13005
#: en/help_topics/rules.txt:11
13011
#: en/help_topics/rules.txt:14
13013
" [name *.html *.xml]\n"
13014
" keywords = xml_escape"
13017
#: en/help_topics/rules.txt:17
13019
"Preferences like these are useful for commands and plugins wishing to\n"
13020
"provide custom behaviour for selected files. For more information on \n"
13021
"end of line conversion see :doc:`eol-help`.\n"
13022
"Keyword support is provided by the `keywords plugin\n"
13023
"<http://doc.bazaar.canonical.com/plugins/en/keywords-plugin.html>`_."
13026
#: en/help_topics/rules.txt:23
13032
#: en/help_topics/rules.txt:26
13034
"Default rules for all branches are defined in the optional file\n"
13035
"``BZR_HOME/rules``. "
13038
#: en/help_topics/rules.txt:29
13044
#: en/help_topics/rules.txt:32
13046
"Patterns are ordered and searching stops as soon as one matches.\n"
13047
"As a consequence, more explicit patterns should be placed towards\n"
13048
"the top of the file. Rule patterns use exactly the same conventions\n"
13049
"as ignore patterns. See :doc:`patterns-help` for details."
13052
#: en/help_topics/rules.txt:37
13056
#: en/help_topics/rules.txt:39
13058
" Patterns containing square brackets or spaces should be\n"
13059
" surrounded in quotes to ensure they are correctly parsed.\n"
13062
#: en/help_topics/topics.txt:1
13064
"authentication Information on configuring authentication\n"
13065
"basic Basic commands\n"
13066
"branches Information on what a branch is\n"
13067
"bugs Bug tracker settings\n"
13068
"checkouts Information on what a checkout is\n"
13069
"commands Basic help for all commands\n"
13070
"configuration Details on the configuration settings available\n"
13071
"conflict-types Types of conflicts and what to do about them\n"
13072
"content-filters Conversion of content into/from working trees\n"
13073
"criss-cross Information on criss-cross merging\n"
13074
"current-formats Current storage formats\n"
13075
"debug-flags Options to show or record debug information\n"
13076
"diverged-branches How to fix diverged branches\n"
13077
"env-variables Environment variable names and values\n"
13078
"eol Information on end-of-line handling\n"
13079
"files Information on configuration and log files\n"
13080
"formats Information on choosing a storage format\n"
13081
"global-options Options that control how Bazaar runs\n"
13082
"hidden-commands All hidden commands\n"
13083
"hooks Points at which custom processing can be added\n"
13084
"launchpad Using Bazaar with Launchpad.net\n"
13085
"location-alias Aliases for remembered locations\n"
13086
"log-formats Details on the logging formats available\n"
13087
"other-formats Experimental and deprecated storage formats\n"
13088
"patterns Information on the pattern syntax\n"
13089
"repositories Basic information on shared repositories.\n"
13090
"revisionspec Explain how to use --revision\n"
13091
"rules Information on defining rule-based preferences\n"
13092
"standalone-trees Information on what a standalone tree is\n"
13093
"standard-options Options that can be used with any command\n"
13094
"status-flags Help on status flags\n"
13095
"sync-for-reconfigure Steps to resolve \"out-of-sync\" when reconfiguring\n"
13096
"topics Topics list\n"
13097
"url-special-chars Special character handling in URLs\n"
13098
"urlspec Supported transport protocols\n"
13099
"working-trees Information on working trees\n"
13102
#: en/help_topics/url-special-chars.txt:1
13104
"Special character handling in URLs\n"
13105
"=================================="
13108
#: en/help_topics/url-special-chars.txt:4
13109
msgid "Bazaar allows locations to be specified in multiple ways, either:"
13112
#: en/help_topics/url-special-chars.txt:6
13113
msgid " * Fully qualified URLs"
13116
#: en/help_topics/url-special-chars.txt:8
13117
msgid " * File system paths, relative or absolute"
13120
#: en/help_topics/url-special-chars.txt:10
13122
"Internally bzr treats all locations as URLs. For any file system paths\n"
13123
"that are specified it will automatically determine the appropriate URL\n"
13124
"representation, and escape special characters where necessary."
13127
#: en/help_topics/url-special-chars.txt:14
13129
"There are a few characters which have special meaning in URLs and need "
13131
"handling to avoid ambiguities. Characters can be escaped with a % and a hex\n"
13132
"value in URLs. Any non-ASCII characters in a file path will automatically "
13134
"urlencoded when the path is converted to a URL."
13137
#: en/help_topics/url-special-chars.txt:19
13139
"URLs represent non-ASCII characters in an encoding defined by the server, "
13141
"usually UTF-8. The % escapes should be of the UTF-8 bytes. Bazaar tries to "
13143
"generous in what it accepts as a URL and to print them in a way that\n"
13144
"will be readable."
13147
#: en/help_topics/url-special-chars.txt:24
13149
"For example, if you have a directory named '/tmp/%2False' these are all "
13151
"ways of accessing the content (0x2F, or 47, is the ASCII code for forward "
13155
#: en/help_topics/url-special-chars.txt:27
13158
" bzr log /tmp/%2False\n"
13159
" bzr log %2False\n"
13160
" bzr log file:///tmp/%252False\n"
13161
" bzr log file://localhost/tmp/%252False\n"
13162
" bzr log file:%252False"
13165
#: en/help_topics/url-special-chars.txt:34
13166
msgid "These are valid but do not refer to the same file::"
13169
#: en/help_topics/url-special-chars.txt:36
13171
" bzr log file:///tmp/%2False (refers to a file called /tmp/\\/alse)\n"
13172
" bzr log %252False (refers to a file called /tmp/%252False)"
13175
#: en/help_topics/url-special-chars.txt:39
13177
"Comma also has special meaning in URLs, because it denotes `segment "
13181
#: en/help_topics/url-special-chars.txt:41
13183
"_`segment parameters`: http://www.ietf.org/rfc/rfc3986.txt (section 3.3)"
13186
#: en/help_topics/url-special-chars.txt:43
13188
"Comma is also special in any file system paths that are specified. To use a "
13190
"comma in a file system path, specify a URL and URL encode the comma::"
13193
#: en/help_topics/url-special-chars.txt:46
13195
" bzr log foo,branch=bla # path \"foo\" with the segment parameter "
13196
"\"branch\" set to \"bla\"\n"
13197
" bzr log file:foo%2Cbranch=bla # path \"foo,branch=bla\"\n"
13198
" bzr log file:foo,branch=bla # path \"foo\" with segment parameter "
13199
"\"branch\" set to \"bla\"\n"
13202
#: en/help_topics/urlspec.txt:1
13203
msgid "URL Identifiers"
13206
#: en/help_topics/urlspec.txt:3
13207
msgid "Supported URL prefixes::"
13210
#: en/help_topics/urlspec.txt:5
13212
" aftp:// Access using active FTP.\n"
13213
" bzr:// Fast access using the Bazaar smart server.\n"
13214
" bzr+ssh:// Fast access using the Bazaar smart server over SSH.\n"
13215
" file:// Access using the standard filesystem (default)\n"
13216
" ftp:// Access using passive FTP.\n"
13217
" http:// Read-only access of branches exported on the web.\n"
13218
" https:// Read-only access of branches exported on the web using "
13220
" sftp:// Access using SFTP (most SSH servers provide SFTP)."
13223
#: en/help_topics/urlspec.txt:14
13224
msgid "Supported modifiers::"
13227
#: en/help_topics/urlspec.txt:16
13228
msgid " gio+ Access using any GIO supported protocols."
13231
#: en/help_topics/urlspec.txt:18
13232
msgid "Bazaar supports all of the standard parts within the URL::"
13235
#: en/help_topics/urlspec.txt:20
13236
msgid " <protocol>://[user[:password]@]host[:port]/[path]"
13239
#: en/help_topics/urlspec.txt:22
13240
msgid "allowing URLs such as::"
13243
#: en/help_topics/urlspec.txt:24
13244
msgid " http://bzruser:BadPass@bzr.example.com:8080/bzr/trunk"
13247
#: en/help_topics/urlspec.txt:26
13249
"For bzr+ssh:// and sftp:// URLs, Bazaar also supports paths that begin\n"
13250
"with '~' as meaning that the rest of the path should be interpreted\n"
13251
"relative to the remote user's home directory. For example if the user\n"
13252
"``remote`` has a home directory of ``/home/remote`` on the server\n"
13253
"shell.example.com, then::"
13256
#: en/help_topics/urlspec.txt:32
13257
msgid " bzr+ssh://remote@shell.example.com/~/myproject/trunk"
13260
#: en/help_topics/urlspec.txt:34
13261
msgid "would refer to ``/home/remote/myproject/trunk``."
13264
#: en/help_topics/urlspec.txt:36
13266
"Many commands that accept URLs also accept location aliases too.\n"
13267
"See :doc:`location-alias-help` and :doc:`url-special-chars-help`.\n"